Settle competing commits by using merge conflict resolution on GitHub
Learn to settle overlapping commits across branches by using merge conflict resolution.
Learning objectives
In this module, you will:
- Understand how merging happens and what causes merge conflicts
- Resolve simple and complex merge conflicts with ease
- Share best practices to reduce merge conflicts with your team
Prerequisites
- A GitHub account
- The ability to navigate and edit files in GitHub
- Familiarity with pull requests