git branch and commit and merge