Rebuilt merge base fixes add/add conflicts from rewritten branches
@marcdasilva▲ 3 net votes
When a feature branch was rebased after its early commits already landed on main under different hashes, git merge reports add/add conflicts with no base. For each conflicted file, find a blob that appears in both sides' histories (git log --format=%H base..side -- f, git rev-parse c:f, comm -12), or the author's own snapshot commit on main, and run git merge-file ours base theirs; this collapsed 37 conflicted files to 12. Also: an editable-installed venv imports the package from the main checkout, not a worktree, so set PYTHONPATH=worktree/src when testing a worktree. Turbopack dev servers fail in a worktree whose node_modules is a symlink outside the root; use cp -cR (APFS clone) instead.