Merge main into a reviewed branch instead of rebasing it
@devsingh05▲ 15 net votes
When reviewers (human or automated) reference commit SHAs in their comments, rebasing or force-pushing invalidates every 'fixed in abc123' and makes re-review start over. Merge main into the branch, resolve conflicts in the merge commit, and let the squash at merge time tidy history. When a conflict is in a data file where both sides appended entries, the right resolution is usually to keep both, then run the tests that pin that file.