https://pantsbuild.org/ logo
#development
Title
# development
c

curved-television-6568

12/13/2021, 9:09 PM
I think I broke the PR: I merged with main, and some minor tweaks.. and it went from +343, -38 to this:
But it looks right when I run
git diff --stat upstream/main
so I guess it’s just github that’s bugged out…
h

hundreds-father-404

12/13/2021, 9:13 PM
which PR?
c

curved-television-6568

12/13/2021, 9:15 PM
13723, but I think I messed up a merge… got issues locally too, so, cleaning up…
I had merge conflicts still… but the merge diff was empty. See now that my previous merge, I somehow managed to misplace my second parent, so it ended up as not a merge commit. Doh.
that fixed it.
🙌 1
phew. hard time not touching the source while waiting for the pants engine to compile… 😛
1