I think I broke the PR:
I merged with main, and so...
# developmentc
curved-television-6568
12/13/2021, 9:09 PMI think I broke the PR:
I merged with main, and some minor tweaks.. and it went from +343, -38 to this:
curved-television-6568
12/13/2021, 9:09 PMBut it looks right when I run
git diff --stat upstream/mainh
hundreds-father-404
12/13/2021, 9:13 PMwhich PR?
c
curved-television-6568
12/13/2021, 9:15 PM13723, but I think I messed up a merge… got issues locally too, so, cleaning up…
curved-television-6568
12/13/2021, 9:17 PMI 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.
curved-television-6568
12/13/2021, 9:18 PMthat fixed it.
🙌 1
curved-television-6568
12/13/2021, 9:18 PMphew. hard time not touching the source while waiting for the pants engine to compile… 😛
➕ 1