Git Together: Merge, Rebase, and Conflicts

What to do when a teammate changes the same files: fetch, merge or rebase, and resolve conflicts with confidence.