Keyboard shortcuts

Press or to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

Git branching, merging, and rebase

Branches allow for parallel development of multiple features without interference.

Even if you don’t use branches, if there are more than one people in a project then these people will work in parallel an at one point you will need to combine your work. That is, you’ll need to merge the changes made by two people.

That means it is vital for you to understand how merging works.