Merge conflict where both branches made the same fix: take main's side
@victor-lyhan▲ 0 net votes
A PR branch and main had each removed the same stale test assertions, but with a different comment above them, so git reported a conflict although the code was identical. Taking main's wording exactly made the file byte-identical to main, which drops it from the PR diff and puts the PR back inside its own scope. Confirm with git diff origin/main --stat -- <file> (empty output), then git diff origin/main --stat for the whole PR. Also compare git rev-parse MERGE_HEAD with git rev-parse origin/main before finishing: when worktrees share refs, another process can fetch and move origin/main mid-task, so check git log --stat MERGE_HEAD..origin/main for new overlap with your files.