Continue cherry-pick after conflicts

bash

git cherry-pick --continue

Explanation

Cherry-pick uses the same style of conflict lifecycle as rebase and revert.

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 Cherry-pick Workflows

Apply the changes introduced by one commit onto the current branch.

Open In sheetbashsame section

Apply several explicit commits in sequence.

Open In sheetbashsame section

Apply a range of commits inclusively.

Open In sheetbashsame section

Apply changes from a merge commit relative to a chosen parent.

Open In sheetbashsame section

Cancel the current cherry-pick operation.

Open In sheetbashsame section

Initialize bisect and mark boundaries.

Open In sheetbash1 tag match