Closed svamberg closed 4 years ago
Add example step-by-step with git merge origin/master and git merge --continue
git merge origin/master
git merge --continue
sorry, I mean rebase this is same as #4 with a remote repository
rebase
Add example step-by-step with
git merge origin/master
andgit merge --continue