magic-merge-commit

Fix a Git merge conflict caused by a squash-merged base branch. Use when a PR can't merge `main` cleanly because its base branch was squash-merged, and Git sees the old commits as conflicting with the squashed commit in `main`. Creates a "magic" merge commit linking the branch to the squashed history.