Merge Conflict Resolution

When a merge conflict occurs in your repository

• A notification is sent to the device
• Sync methods other than Force Push and Force Pull are disabled
• A MERGE CONFLICT entry is added to the recent commits

Clicking on the MERGE CONFLICT entry will

• Take you to the resolution dialog
• Allow you to navigate between conflicts using the arrows
• Allow you to decide which changes to keep and discard
• Allow you to open any conflicting file in an editor for more control

There is also the option to Force Push or Force Pull using the sync menu (outside the merge conflict dialog)

---

See also: Sync Mode, Troubleshooting