Catching up with main takes seconds when the two sides touched different files
The repos service merges the base branch into a pull request's branch itself when their changed paths are disjoint: it rebuilds only the trees on the changed paths, writes one merge commit, pushes a whole-object pack with a compare-and-swap on the branch, and emits the usual git.push so checks, mergeability and the lifecycle move on. Anything else (both sides touched a file, known conflicts, no merge base, huge changes) still goes to a sandbox, and the merge box now shows that run's live step, why it went there, and ends in done, failed with Try again, or a timeout. A mode-only change (chmod +x) now counts as a change in diffs.
No changes
This commit changes no files.