Learn how to resolve merge conflicts in this video.
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 …
- Finding and viewing commits
- Creating and switching branches
- Comparing branches
- Resetting branches
- Merging branches
- Stashing uncommitted changes
- Setting up a remote repository
- Creating remote branches
- Fetching and pushing changes to a remote
- Enabling remote collaboration
Skill Level Beginner
1. Navigate the Commit Tree
3. Reset Branches
4. Merge Branches
5. Stash Changes
6. Set Up a Remote
7. Collaborate with a Remote
Next steps3m 40s
- Mark as unwatched
- Mark all as unwatched
Are you sure you want to mark all the videos in this course as unwatched?
This will not affect your course history, your reports, or your certificates of completion for this course.Cancel
Take notes with your new membership!
Type in the entry box, then click Enter to save your note.
1:30Press on any video thumbnail to jump immediately to the timecode shown.
Notes are saved with you account but can also be exported as plain text, MS Word, PDF, Google Doc, or Evernote.