Auto Merge behavior when there are conflicts

We’re trying out the github auto-merge beta in our organization. What is the expected behavior when auto merge is enabled on a PR that has conflicts with the base branch? Our expectation is that auto merge is NOT performed until conflicts are resolved. Is this the current behavior?

1 Like

Git simply can’t (and won’t) complete a merge operation when there are conflicts, unless you’ve enabled ReReRe (Reuse recorded resolution of conflicted merges):

https://git-scm.com/docs/git-rerere

I have no idea if GitHub supports ReReRe, or how, but it doesn’t seem your case from what you wrote.

1 Like