RepoBeam
Releases Download

Resolve a conflict

When Git can’t combine two changes to the same lines, RepoBeam opens a resolver where you compare both versions and decide what the file should contain.

When it appears

A conflict can happen when you merge a branch, repair a diverged branch with Fix sync, cherry-pick a commit, or undo one with a new commit. RepoBeam pauses the operation and shows Resolve Conflicts at the top of the sidebar.

Steps

  1. Open Resolve Conflicts and select a file from the list.
  2. Compare the two versions shown side by side. Each is labelled with a short explanation of where it came from.
  3. Keep one version, keep both, or edit the Final result directly.
  4. Click Save resolution. RepoBeam saves and stages exactly what the final result shows.
  5. When every file is resolved, continue the operation. To stop instead, cancel it and your branch returns to where it started.
RepoBeam conflict resolver with both versions, choices and an editable final result

Good to know

  • A file can’t be saved while <<<<<<<, ======= or >>>>>>> markers remain.
  • Binary files can’t be combined as text. Choose one version instead.
  • The operation stays paused until you continue or cancel it, so you can open Resolve Conflicts again at any time.