Thursday, February 5, 2015

Notes In Resolving Conflict on GIT Rebase

So after doing git rebase master from a featured branch or some other branch you get a conflict.

Here are some notes on resolving.
  • After getting the conflict, you will be redirected to temporary branch where you have to resolve your conflict.
  • Resolve your conflicts as usual removing <<<<<<, ======, >>>>>>>> and doing your manual merges
  • After resolving do a git add .
  • Do not commit but after doing git add do git rebase --continue or git will complain about having no resolution to your conflict
  • The rebase should go as usual