Overview

If there's a merge conflict for one of the files in the repo, GitUp will display conflict information for the file instead of its diff.

Resolving Conflicts

1. Open the conflicted file with the external merge tool or appropriate editor e.g. Xcode for source files
2. Look for the conflict areas in the file (typically indicated between the <<<<<<< and >>>>>>> markers)
3. Resolve the conflicts and save the file
4. Return to GitUp and click "Mark as Resolved" for the conflicted file

You can change the external merge tool used by GitUp in the app preferences.

Keyboard Shortcuts

• Arrow up & Arrow down to select a different file
• O to open the selected file with its default external editor
• D to view the diff for the selected file with the external diff tool
• R to resolve the merge conflicts for the selected file with the external merge diff tool
• M to mark the selected file with a merge conflict as resolved

Tips

• You can resize the panes by putting your mouse over a divider and dragging

Known Issues and Limitations

• Conflict resolution in GitUp does not handle git rerere