bot-resolve-conflicts: a git commit failure can bypass the escalation marker (re-dispatch risk)

bot-resolve-conflicts: a git commit failure can bypass the escalation marker (re-dispatch risk) #1343