Added stuff about branching and rebasing