In this video, cover several different work strategies that can help to minimize the number of merge conflicts.
- [Instructor] In this movie, I want to talk … about a couple strategies that you can use … to reduce merge conflicts. … Merge conflicts aren't pleasant to have to solve … so if we can use some strategies to reduce them … it's going to pay big benefits. … The first and simplest is just to keep your lines short. … If lines are short there's less characters … in them, it's less likely that something's … going to conflict, and it's easier to identify … and fix conflicts when they arise. … We saw this in the last movie when we had … this long block of text. … It was difficult to find what had changed in it. … But if the lines had been very short, … as they often are in code, it would've been easier. … You also want to keep your commits small and focused. … Don't make commits that are enormous in scope, … that touch on 50 or 60 different files, … especially if those are not related changes. … Instead, make a commit that does one single thing. … It makes it easier forget to merge that commit …
- 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.