Git rebase failing

• 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.

• Failing that, you should re-create your branch or you can be able to remove the .git/rebase-merge directory, which contains the rebase state.

Apparently the branch onto which you want to rebase, was also rebased between the time you branched off, maybe cleaning history up or rebasing on yet another branch. If so, you need to:

• abort, current mess:git rebase --abort
• to be current: git fetch

• now the interesting part:

  git rebase --onto BUDDY_BRANCH YOUR_BRANCH~ YOUR_BRANCH

e.g.you branched of your local master (checkout of origin/master), a new branch test_branch (which you now want to update with current origin/master)

git rebase --onto master test_branch~ test_branch

What this does is in simple terms, it takes your branches initial parent commit, finds it's counterpart in current master and rebases based on that.

When you are updating your local branch with the another branch, you must resolve conflicts by choosing between your modifications and theirs.After resolving conflicts you can continue your rebasing by writing this git command :

git rebase --continue

In case when you want to abort your action of rebasing you can write this git command :

`git rebase --abort`