git add -A ran against the shared target checkout, sweeping in whatever untracked or unrelated modified files a concurrent session left there and committing them into an unrelated merge. Stage exactly the paths that were reported conflicted and resolved instead.