> ## Documentation Index
> Fetch the complete documentation index at: https://2026commitplusinc.mintlify.site/llms.txt
> Use this file to discover all available pages before exploring further.

# Resolve Conflict Tool

> Visual diff viewer with inline conflict markers and stage resolution.

<img src="https://mintcdn.com/2026commitplusinc/OlGhH2PWWQXoSXQe/showcase/resolve-conflict-ui.png?fit=max&auto=format&n=OlGhH2PWWQXoSXQe&q=85&s=5de021ba009eb7ae73b2f5602fb30311" alt="Resolve Conflict UI" width="2400" height="1588" data-path="showcase/resolve-conflict-ui.png" />

When merges, rebases, cherry-picks, or reverts produce conflicts, Commit+ opens a visual tool so you can resolve them without leaving the app. The goal is to keep the structure of the conflict visible, make the available choices obvious, and help you move from inspection to resolution without jumping out to another editor.

## Workflow demo

<video
  controls
  src="https://mintcdn.com/2026commitplusinc/OlGhH2PWWQXoSXQe/showcase/resolve-conflict.mp4?fit=max&auto=format&n=OlGhH2PWWQXoSXQe&q=85&s=9e6bc6291e35cedde4191ca81d5e3de4"
  autoPlay
  muted
  loop
  playsInline
  preload="auto"
  disablePictureInPicture
  aria-label="Resolve conflict workflow"
  style={{
width: "100%",
borderRadius: "8px",
display: "block",
backgroundColor: "#f3f4f6",
marginTop: "16px",
}}
  data-path="showcase/resolve-conflict.mp4"
/>

## What it does

* Inline rendering of conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`).
* **Accept ours / theirs / both** controls per hunk.
* Stage individual hunks as you resolve them.
* Navigate unresolved conflicts.
* **Abort** the merge, rebase, cherry-pick, or revert to return to your prior state.

Supported aborts and resolved history actions can be undoable with `Cmd+Z`.