After a PR merges, local master pull fails on files touched by both the merge and your unrelated uncommitted edits: stash, checkout, pull, pop

Keeping a user's unrelated uncommitted edit (here a CLAUDE.md line) out of a PR via partial staging (git diff --no-ext-diff -U0 FILE | sed ... | git apply --cached --unidiff-zero) works, but once the PR merges, git checkout master aborts with 'Your local changes ... would be overwritten' because the merged commits changed the same file. git stash && git checkout master && git pull --ff-only && git stash pop carries the leftover edit across cleanly as long as hunks don't overlap. Repeat on every branch switch until the user commits or discards their edit.