Resolve conflicts

Resolve each file

When a merge, rebase, cherry-pick, or revert stops on conflicts, the files appear in Working Changes.

1. Right-click a conflicted file and choose Resolve in Merge Tool.
2. Resolve the conflicting sections in your configured external tool and save the result.
3. Return to GitLode and choose Mark Resolved for that file. This stages the resolved version.
4. Repeat for the remaining conflicted files.

To use a merge tool, you need Full Git Integration. If no merge tool is available, follow Configure Git and external tools. Conflict editing takes place in the external tool.

In Basic mode, open the conflicted file in a text editor, edit the conflicting sections, remove the conflict markers, and save the file. Then choose Mark Resolved.

Finish or cancel the operation

Choose Continue when the conflicts are resolved. For operations that support it, Skip omits the current item. Choose Abort to cancel the active operation, then confirm the action.

You can also open Activity with Command+0 and select the conflicted operation. Continue and Abort are available there, including when its workspace is closed.

Conflicts during Undo or Redo

Recovery can stop when GitLode reapplies changes made after the original operation. Resolve those conflicts, then use Continue Recovery in Activity. Abort Recovery restores the state captured before recovery began.

Use the recovery controls for this case. For the differences between Git conflicts and checkpoint recovery, see Undo and recovery.