Search code examples
gitgit-rebasegit-merge-conflict

finish git rebase operation after conflict

For my job I need to do a git rebase of my feature branch onto the development branch.

These are my commands thus far to prepare the rebase:

git checkout feature-branch
git rebase development
# resolve conflicts in Visual Studio
git rebase --continue

After this, I'm getting the following in the cmd:

git rebase stuck in shell after conflict

Now it's just as if I'm typing a novel in Notepad. Hitting enter, ctrl + C, ... doesn't do anything.

I've already read other questions like this one but this doesn't offer me a clue of how to complete the rebase / exit the shell.

So how do I finish this rebase operation? What buttons do I need to press?

Solution

  • It looks like you've been dropped into the vim editor, and currently in replace mode. You can get out of that by just hitting esc. Then you can type i to enter insert mode (which will probably behave more as you'd expect). Type your commit message, then hit esc again (back to command mode), then :wq (write-quit) and enter, and you're done.