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.