Merge

Combining another branch into the one you're on. Same click path as the branches page's merge section; this page goes deeper on the three outcomes.

1. Branches tab → pick a branch in the merge picker → click merge.

2. GitRoot dry-runs it first. You'll see exactly one of three outcomes before anything is applied:

   • fast-forward: the target has no commits of its own since you diverged, so your branch just moves forward, no new commit
   • clean: both sides changed but nothing overlaps, combines automatically
   • would conflict: names the exact files that clash, before you commit to running it

3. Confirm to actually run it.

   "merged feature-login into main: 3 commits, no conflicts."

A "would conflict" merge that you run anyway pauses with the shared conflict dialog.