git rebase merge conflict

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   First  rewinding head to replay your work on top of it    Applying  Issue 135 homepage refresh Using index info to reconstruct a base tree     lt stdin gt  17  trailing whitespace         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

User · Answer

When you have a conflict during rebase you have three options:

You can run git rebase --abort to completely undo the rebase. Git will return you to your branch's state as it was before git rebase was called.
You can run git rebase --skip to completely skip the commit. That means that none of the changes introduced by the problematic commit will be included. It is very rare that you would choose this option.
You can fix the conflict as iltempo said. When you're finished, you'll need to call git rebase --continue. My mergetool is kdiff3 but there are many more which you can use to solve conflicts. You only need to set your merge tool in git's settings so it can be invoked when you call git mergetool https://git-scm.com/docs/git-mergetool

If none of the above works for you, then go for a walk and try again :)

User · 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   git mergetool   Then add your changes and go on  git rebase --continue   Good luck

User · Answer

Note  with Git 2 14 x 2 15  Q3 2017   the git rebase message in case of conflicts will be clearer   See commit 5fdacc1  16 Jul 2017  by William Duclot  williamdclt    Merged by Junio C Hamano -- gitster -- in commit 076eeec  11 Aug 2017        rebase  make resolve message clearer for inexperienced users   Before   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    After   Resolve all conflicts manually   mark them as resolved with git add rm  lt conflicted files gt  then run  git rebase --continue    You can instead skip this commit  run  git rebase --skip   To abort and get back to the state before  git rebase   run  git rebase --abort          The git UI can be improved by addressing the error messages to those   they help  inexperienced and casual git users    To this intent  it is helpful to make sure the terms used in those messages can be understood by this segment of users  and that they guide them to resolve the   problem       In particular  failure to apply a patch during a git rebase is a common   problem that can be very destabilizing for the inexperienced user    It is important to lead them toward the resolution of the conflict  which is a   3-steps process  thus complex  and reassure them that they can escape a   situation they can t handle with  --abort     This commit answer those two points by detailing the resolution process and by avoiding cryptic git linguo

User · Answer

If you have a lot of commits to rebase  and some part of them are giving conflicts  that really hurts  But I can suggest a less-known approach how to  squash all the conflicts     First  checkout temp branch and start standard merge  git checkout -b temp git merge origin master   You will have to resolve conflicts  but only once and only real ones  Then stage all files and finish merge   git commit -m  Merge branch  origin master  into  temp     Then return to your branch  let it be alpha  and start rebase  but with automatical resolving any conflicts   git checkout alpha git rebase origin master -X theirs   Branch has been rebased  but project is probably in invalid state  That s OK  we have one final step  We just need to restore project state  so it will be exact as on branch  temp   Technically we just need to copy its tree  folder state  via low-level command git commit-tree  Plus merging into current branch just created commit   git merge --ff   git commit-tree temp  tree  -m  Fix after rebase  -p HEAD    And delete temporary branch  git branch -D temp   That s all  We did a rebase via hidden merge   Also I wrote a script  so that can be done in a dialog manner  you can find it here

[git] git rebase merge conflict

Examples related to git

Examples related to github

Examples related to git-rebase