Question:
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:
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
First, rewinding head to replay your work on top of it... Applying: Issue 135 homepage refresh Using index info to reconstruct a base tree... %h4 warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging app/views/layouts/application.html.haml CONFLICT (content): Merge conflict in app/views/layouts/application.html.haml Auto-merging app/views/home/index.html.haml CONFLICT (content): Merge conflict in app/views/home/index.html.haml Auto-merging app/views/home/_group_projects.html.haml CONFLICT (content): Merge conflict in app/views/home/_group_projects.html.haml Failed to merge in the changes. Patch failed at 0001 Issue 135 homepage refresh When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To check out the original branch and stop rebasing run "git rebase --abort". |
I don’t know how to fix these, please help.
Answer:
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)
|
1 2 |
git mergetool |
Then add your changes and go on
|
1 2 |
git rebase --continue |
Good luck