Back to Course OverviewBack

This content is locked

Enroll in the course to unlock

Git & GitHub Foundation

Fix Merge Conflicts

Enroll NowFree
Learn what happens when two people edit the same file and how to fix it.
Previous
Course Content

Course Content

What is Git and Commits
7:55Free
Undo Changes with Git Reset
13:04
Git Branches & Merging
9:49
Connect to GitHub with Push and Pull
10:08
Fix Merge Conflicts
10:31

Course Content

What is Git and Commits
7:55Free
Undo Changes with Git Reset
13:04
Git Branches & Merging
9:49
Connect to GitHub with Push and Pull
10:08
Fix Merge Conflicts
10:31