In the last movie we learned about merge conflicts, and we actually created one in our …Explore California site. …That's where we left things off. We left things in the middle of a merge, the merge has not …yet been completed, and Git wants us to resolve these conflicts before it will go ahead and …complete the merge. …What I want us to look at in this movie is how we go about resolving these conflicts. …You've three choices as to what to do to resolve these conflicts. …First, you can simply abort the merge. …You can say oops! That was not what I wanted to do, I was not anticipating all of these …problems, get me out of here.…

We'll see how to do that. …The second is that we can resolve the conflicts manually. …Most of the time this is what you're going to do, and I think especially while you're …learning how to resolve these conflicts, I think this is the one that you want to do. …And then the third one is that you can use a merge tool. …There're number of tools out there that will help you to resolve these kinds of conflicts. …