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:

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?

CodePudding user response：

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.

CodePudding user response：

I don't have enough rep to post a comment, but as a side note it's possible to configure Git to use a different editor, for example git config --global core.editor "code --wait" would change the default to be VS Code

more information on this answer https://stackoverflow.com/a/36644561/18039381