Resolving Conflicts

Resolving Conflicts

Whenever a merge, rebase, cherry-pick, revert, or git am leaves conflicts, a banner appears across the top of the app — you don't need to go looking for it.

The banner tells you:

• What operation is in progress (merge, rebase, etc.)
• Which files are conflicted, as clickable chips — clicking one opens it directly in Working Copy

Resolving a conflict

1. Click a conflicted file to open it.
2. Edit it to resolve the conflict, then stage it like a normal change.
3. Once every conflicted file is resolved and staged, the banner's Continue button becomes enabled.

Backing out

If you'd rather not go through with the operation, Abort returns the repository to exactly the state it was in before the operation started. Because this discards the in-progress merge/rebase entirely, it always asks for confirmation.