how to git rebase --skip?

[fmorroni]

Is there a way of skipping commits with conflicts during a rebase? We use it a lot in our workflow in dev branches, but I don't see the option. I can't drop the commit if it has conflicts either getting an error Some todos not found in git-rebase-todo.

[stefanhaller]

The equivalent of git rebase --skip is m, s. Or the longer version: bring up the rebase options menu (m), and choose the "skip" entry (s).

Some todos not found in git-rebase-todo

This is a bug, never noticed that: it happens when you try to drop the "conflict" entry in the list. I'll put that on the list of things to fix.

[fmorroni]

The equivalent of git rebase --skip is m, s. Or the longer version: bring up the rebase options menu (m), and choose the "skip" entry (s).

Haha mb should have seen that. Thanks!