When a merge, rebase, cherry-pick, or revert stops on conflicts, GitLane switches into a conflict workspace. You don’t have to go find a terminal to finish the operation.
Resolving
Pick a file
Conflicted files are listed with what kind of conflict each one is.
Resolve
Work hunk-by-hunk in an inline or side-by-side editor, picking per line where you need to. For a file you don’t need to be surgical about, take ours or theirs wholesale.
Continue, skip, or abort
Once the conflicts are resolved, continue the operation — or skip this commit, or abort the whole thing and return to where you started.
The awkward cases
Binary conflicts and modify/delete conflicts are handled explicitly rather than dumped on you as raw markers.
Resolved outside GitLane? If you fixed a file in your own editor, stage it as-is — GitLane accepts the file as the resolution.
Changed your mind? A staged resolution can be un-staged so you can redo it.