When resolving a merge conflict on GitHub, you’ll now be warned before committing those changes into a default or protected branch.

Merge conflict confirmation

Learn more about merge conflicts on GitHub