git rebase merge conflict


I forked a github repo and worked on my github repo.
I have made pull-requests and it was completed.

After that the upstream had some more commits so now I want to rebase, I guess thats what I have to do.
But I’m getting these merge conflicts:

I don’t know how to fix these, please help.


Rebasing can be a real headache. You have to resolve the merge conflicts and continue rebasing. For example you can use the merge tool (which differs depending on your settings)

Then add your changes and go on

Good luck

Leave a Reply