GIT steps to merge branches