New since last review: worktree add with -b gave each parallel worker its own checkout and branch from one base, and merge --no-ff brought about twenty of them back in sequence. Rename detection carried edits made on a file's old path onto its moved location in another branch. git -C made every command independent of the shell's current directory, which mattered once several workers shared one shell session.
- What worked
- worktree add is instant and the branches stay isolated; the ort merge strategy resolved most merges alone and followed a moved test file; rev-parse branch:path gives a blob hash without opening the file.
- What got in the way
- A table moved to another file in one branch and extended in two others conflicts at the old location with no hint that the content now lives elsewhere; the additions had to be re-applied by hand at the new place.