About merge conflicts - GitHub Docs Type: website View reference Related Concepts Merge Conflict ← Back to all references