Next | Stop merging master | 15 |
A better way to get the new code from master into your topic branch is with rebase
git-rebase will try to redo all your changes starting from somewhere else
git checkout topic git rebase origin/master
The result:
Before | After | |
---|---|---|
Next | Copyright © 2013 M. J. Dominus |