From the course: Git: Branches, Merges, and Remotes
Unlock the full course today
Join today to access over 22,600 courses taught by industry experts or purchase this course individually.
Resolve merge conflicts
From the course: Git: Branches, Merges, and Remotes
Resolve merge conflicts
and we've created one in our project. In this movie we're going to learn how to resolve them. There are three ways that you can resolve merge conflicts. The first is that you can abort the merge. You can simply say stop, I don't want to proceed, let's back up. The second is that you can resolve the merge conflicts manually And the third is that you can use a merge tool to help you through the process. So we had tried to merge the text_edits branch into our master branch. There was a conflict with the mission.html file, and we know that we're still in the middle of that merge. If we come over here and look at the file we can see that there are merge indicators for the beginning of the HEAD and the content that it has. It goes all the way down to here and then below that is everything that's in text_edits. So we have both of these here that we're ready to compare and git wants us to figure out what needs to be done. Let's suppose that instead of trying to proceed with the commit we…
Practice while you learn with exercise files
Download the files the instructor uses to teach the course. Follow along and learn by watching, listening and practicing.