MISSION 121

Merge Conflicts

Learn how to resolve merge conflicts with Git branches.

Objectives

  • Learn abouit merge conflicts and when they occur.
  • Learn about different techniques for resolving merge conflicts.

Mission Outline

1. Introduction
2. Aborting a Merge
3. Resolving Conflicts
4. Resolving Multi-Line Conflicts
5. Resolving Multiple Conflicts
6. Accepting Changes From Only One Branch
7. Ignoring Files
8. Removing Cached Files
9. Takeaways

git-and-vcs

Course Info:

Intermediate

The median completion time for this course is 4.9 hours. ​View Details​​​

This course is requires a basic subscription. This course includes four missions and one installation tutorial.  It is the tenth course in the Data Analyst in Python path and Data Scientist in Python path.

START LEARNING FREE

Take a Look Inside