What this helps you do
Resolve merge, rebase, cherry-pick, and revert conflicts with correctly labelled inputs.
An active Git operation opens the operation banner and conflict resolver in Changes.
Before you start
Resolution, Continue, and Abort remain available on Free so an in-progress operation cannot trap the checkout.
Steps
- Select an unresolved path and inspect Current, Incoming, and optional Base content.
- Choose Use left, Use right, Use both, or edit the Result.
- Review Save resolution, repeat for remaining paths, then choose Continue operation.
Expected result
Resolved content is written only after revalidation, staged, and protected by a recovery copy.
Controls
operation.continueContinues the active Git operation when all paths are resolved.
- Screen
- Operation banner
- Available
- Free continuation
operation.abortAsks Git to abort the active operation.
- Screen
- Operation banner
- Available
- Free continuation
conflict.leftCopies the labelled left input into Result.
- Screen
- Conflict resolver
- Available
- Free continuation
conflict.rightCopies the labelled right input into Result.
- Screen
- Conflict resolver
- Available
- Free continuation
conflict.bothCombines both inputs in Result for review.
- Screen
- Conflict resolver
- Available
- Free continuation
conflict.saveWrites and stages the reviewed result after revalidation.
- Screen
- Conflict resolver
- Available
- Free continuation
Recovery
For binary or modify/delete conflicts, use the offered complete-side or delete choice. Abort remains available when Git supports it.