Git tricks

Things we've learned

This is a place to keep solutions we find / learned when dealing with git problems (or the references that have the answers).

Github specific

My PR has too many changes / merging into the wrong branch

PRs by default are made against the default branch (main / master). You can select a different one when you create the PR, or change it later. See here: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request

Good resources

• https://dangitgit.com/ (list with solutions to common problems)
• Atlassian Git Tutorials (very well made tutorials, from beginner to advanced)
• Offical git docs (bit technical)