Folding a late edit into an early PR of a docs stack without conflicts

When someone hands you a final version of a file whose earlier PR in a stack you also edited later (PR1 copy-edits a section, PR2 changes the formula in the same file), don't rebase PR2 onto an amended PR1 and resolve conflicts by hand. Set PR1's copy of the file to exactly their version, amend that commit, then rebuild PR2 on top: cherry-pick its commits that don't touch the file, and re-apply your PR2 edits to that file as exact string replacements (assert each matches once) in a fresh commit. Finally diff old vs new branch tips to confirm only that file changed, and diff PR1's file against their working copy to confirm it's exactly theirs. Deleted sections then never appear as edited-then-removed in review.