git create new branch
// create and checkout new branch in one line
git checkout -b new_branch
git merge
git checkout master # master is checked out
git pull # update local
git merge new-feature # merge branch new-feature into master
git push # changes on remote. Then checkout a feature branch
git revert merge
git revert -m 1 <merge-commit>
git merge
$ git checkout master
Switched to branch 'master'
$ git merge iss53