|Next||Stop merging master||16|
What is going on here?
Git figures out the place your topic branch diverged from master
Makes patches for all the changes on your branch since then
Applies them in order to the code on origin/master
If it all works, topic to the head of the new topic branch
Now your topic branch is built atop an up-to-date master
|Next||Copyright © 2013 M. J. Dominus|