At what stage of the merge operation do you resolve conflicts in the commit?

A conflict during a merge operation in Git is resolved at the stage when Git cannot automatically merge changes from different branches. This occurs after the git merge command, when Git stops and reports a conflict. Resolving the conflict is done manually — the developer edits the conflicting files, resolves discrepancies, then adds the fixed files to the index (git add) and completes the merge with a commit (git commit).

That is, the conflict is resolved before creating the commit, during the preparation for it. The commit records the already resolved changes.