Good getting started with GitHub and Git instructions from Microsoft (as part of their contributor onboarding): <https://learn.microsoft.com/en-us/contribute/content/>, h/t Bill Anderson
Git - Rerere, a Git feature that caches how conflicts were resolved, and auto-resolves the same conflict when it happens again. h/t Flancian