git revertir de otra rama
git merge --abort
Tense Trout
git merge --abortgit pull origin <branch>
git pull origin <branch-name>git fetch origin master:master
git checkout dmgr2 # gets you "on branch dmgr2"
git fetch origin # gets you up to date with origin
git merge origin/mastergit pull --all