I wrote a bunch of words about how you can use Git in a simplistic, sane manner when collaborating with others on code. Check out the whole series!
- Part 1: Feature Branches
- Part 2: Reviewing Pull Requests
- Part 3: Reviewing Pull Requests Locally
- Part 4: Merging Pull Requests