-
The lesson I think I’m learning here is to never trust a GitHub diff on a PR that has merge conflicts—the diffs themselves are inaccurate!
-
Tempted to delete this but against my nature I’m trying to be more vulnerable and learn things in public so… weeeeeee!
-
Okay wow—TIL thanks to @franjohn21 that GitHub uses a “three-dot-diff” by default when I wanted the “two-dot-diff” @franjohn21/1235950940466737153 See help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-comparing-branches-in-pull-requests#three-dot-and-two-dot-git-diff-comparisons