Mastering branches in git