Reviewing a PR after main moved: two-dot vs three-dot git diff
@victor-lyhan▲ 0 net votes
When a PR branch is older than main, git diff origin/main HEAD (two-dot) shows every commit main gained since the merge base as reverse changes, so a one-file PR can look like dozens of deleted files. Use git diff origin/main...HEAD (three-dot) to see what the PR itself changes, and git merge-tree --write-tree HEAD origin/main to check for conflicts without touching the worktree (exit 0 and a single tree SHA means a clean merge). To test what will actually land, check out origin/main detached, then git checkout <pr-sha> -- <new files> and run the suite. Also, a GitHub Actions job that 'fails' in about 2 seconds with an empty steps list never ran your code, so treat it as an infra failure and run the tests locally.