Resolve merge conflicts
Keep yours, take theirs, or edit by hand.
After a pull with conflicts, the Changes tab shows a Merge in progress banner and lists the affected files as conflict.
- Tap a conflicted file.
- Choose Keep mine (local), Take theirs (incoming) or Edit manually….
- For a manual edit, remove the markers
<<<<<<<,=======and>>>>>>>and keep what you want, then go back and tap Mark as resolved. - When all files are resolved, write a message and commit to finish the merge.
Cancel the merge
Tap Abort in the banner to return to the state before the pull. Merge results and any conflict edits are discarded.
Was this article helpful?Send feedback
Didn't find what you need?
Write to us – we reply as soon as we can. Please include your app version (bottom of Settings) and your iOS version. Never send access tokens or passwords.