All docs

Resolve merge and rebase conflicts

Inspect current and incoming changes, save the intended result, and resume the paused Git operation.

Read the operation and file names

Open the conflict resolver from the paused merge, rebase, or cherry-pick. Select a conflicted file and read the operation context and the Current and Incoming labels before choosing a side.

For a merge of feature/search into main, current is the checked-out destination and incoming is the feature branch. During a rebase onto main, the current side is the history built on the new base so far and the incoming side is the commit being replayed. Check the labels in the resolver for your specific operation.

Conflict resolver showing the merge context, Current and Incoming labels, and unresolved result
Read both sides and check the result for each conflicted region before marking the file resolved. Open full-size image

Resolve one file

  1. Select the conflicted region. For example, one side may change the empty-state text while the other adds a retry button. Keep both changes in the result when both are needed.
  2. Review the finished file for leftover conflict markers and confirm it still reads correctly.
  3. Select Mark file resolved to save the result and mark the file in Git. Confirm the file's status changed, then repeat for the other conflicted files.

For a binary file or a delete/modify conflict, use the file-level choice. Bulk Current and Incoming actions affect multiple files. Review the affected paths before using them.

Resume or abort the operation

When every file is resolved, use the operation's continue or finish action. Run the relevant build or tests when practical and inspect the result in the graph. If you decide to abort, read what will be restored and save any manual resolution edits you want to keep first.

All conflicts resolved banner with Continue merge and Abort merge actions
The banner identifies the next action for the operation. In this merge, select Continue merge. Open full-size image

Recover a previous commit or saved work

More docs