"Don’t merge. Rebase only. Keep a linear history." This. It makes life so much simpler. With teams that don't have a lot of experience with git, however, I ten

"Don’t merge. Rebase only. Keep a linear history." This. It makes life so much simpler. With teams that don't have a lot of experience with git, however, I tend to use the "Squash and Merge" feature, coupled with forcing a linear history.