| Next | Stop merging master | 20 |
“But what if the patches don't apply?”
Then you have to resolve a conflicted merge
You would have had to do that with git-pull anyway
After the conflicts are resolved and commited, you use:
git rebase --continue
| Next | |
Copyright © 2013 M. J. Dominus |