Summary

In this module, you learned to settle overlapping commits across branches by using merge-conflict resolution.

You learned about:

• How merging happens and what causes merge conflicts.
• Resolving simple and complex merge conflicts with ease.
• Sharing best practices to reduce merge conflicts with your team.

Now that you learned to resolve merge conflicts, learn to Automate DevOps processes by using GitHub Apps.

Learn more

Here are some links to more information on the subjects we discussed in this module.

• Merging a pull request
• About merge conflicts
• Addressing merge conflicts
• About Git rebase

Provide feedback

Use this issue form to provide content feedback or suggested changes for this Microsoft Learn module. GitHub maintains this content and a team member will triage the request. Thank you for taking the time to improve our content!