Continue a conflicted revert

bash

git revert --continue

Explanation

Revert can stop on conflicts just like cherry-pick and rebase.

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Same sheet · prioritizing Revert Basics

Create a new commit that reverses an earlier commit.

Open In sheetbashsame section

Apply inverse changes into the index and working tree first.

Open In sheetbashsame section

Reverse a merge relative to a chosen parent.

Open In sheetbashsame section

Quick decision guide for the three similarly named commands.

Open In sheettext2 tag match

Move HEAD back one commit while preserving index and working tree.

Open In sheetbash1 tag match

Restore a file in the working tree from the index.

Open In sheetbash1 tag match