The Plogonening (try 3)

[NotNite]

Ended up redoing it because merge conflicts. MERGE AFTER API 9, I DID NOT TEST THIS IN A PRODUCTION SETUP.

[philpax]

There's no way to decouple the formatting changes from the functional changes, is there? Hiding whitespace still triggers a diff on linebreak :(

[NotNite]

I can theoretically decouple them into multiple commits if that'd be preferred, but to be honest I forgot what exactly I changed at this point.

[philpax]

Would it be possible to reformat to the original formatting (I'm guessing not, because the .editorconfig was introduced afterwards), extract the local changes, and then reapply the reformat?

[NotNite]

No, because the formatting of the original repository was inconsistent with basically every style guide I checked. There is no "reformat to the original formatting" because the original formatting wasn't formatted in the first place.

[philpax]

...would it be possible to undo the commit, revert all of the formatting changes manually, make a commit for local fixes, and then reapply the formatting? Having them split apart will make it much easier to review / much more likely to land.

[NotNite]

Really I can just redo the changes I made from scratch and guess what was wrong, which is probably the easiest. Should I revert the commit on this branch and commit new ones?

[philpax]

Up to you! I'd personally git reset HEAD~ and hack away at it, but a revert is also fine.

[philpax]

lol that was quick

[NotNite]

ADHD gremlin unmatched power 💪

[philpax]

@goaaats sir

[goaaats]

I was fighting through the reformat earlier, I'll try to get it merged in my lunch break tomorrow

[goaaats]

Hand-merged and reapplied the format, thanks a bunch. I added you as a co-author but GitHub doesn't seem to be showing it, apologies.

[NotNite]

Thank you! It's probably because I have GitHub vigilant mode on, but w/e, I don't care.