Menu
I'm doing git pull --rebase and get a conflict. After I resolve a conflict, git show me that I'm in the middle of a merge. If I was doing a simple merge, I'd just add resolved files to the index and do a manual commit. But since I'm also rebasing how do I proceed to have other commits applied after I've resolved a conflict?
789
When you're finished making all your changes, you can run git rebase --continue . As before, Git is showing the commit message for you to edit.
Rebasing is used to integrate changes from one branch into another to resolve conflicts when multiple commits happen on the same file. Never do a rebase on public (master) branches. You submit a change. Somebody else submits a change and that change merges.
When you used git pull --rebase and got conflicts, git displayed :
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
In your case, you should use git rebase --continue
120
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
