Resolving Conflicts

When a file has merge conflicts, Gitfox opens the editable conflict diff from the worktree. Conflicted files stay on the Unstaged side because a file cannot have staged changes while it is still conflicted.

Resolve the whole file

Use the toolbar buttons when one side should win for the whole conflicted file:

• Use Ours keeps your current branch version.
• Use Theirs keeps the incoming version.

These actions resolve the selected conflicted file using Git's conflict resolution operation.

Resolve individual conflict hunks

If you want to keep different sides for different conflict hunks, resolve them inside the diff instead.

Find a highlighted conflict block and use either of these controls:

• Click the gutter button next to the conflict hunk, then choose Choose Ours or Choose Theirs.
• Right-click the conflict hunk and choose Choose Ours or Choose Theirs from the context menu.

Gitfox removes the conflict markers for that hunk and keeps the side you chose.

After resolving individual hunks in the diff, save the diff with File → Save... or the Save toolbar button.

For conflicted files, Gitfox writes the edited file only when you save. Saving also adds the file to the index after the conflict markers are removed, which marks the file as resolved.