Working with branches in git

This is a good description of working with merging or rebasing in git. What they do and how to deal with them

Merging vs Rebasing (from Atlasian) Show archive.org snapshot