Now Playing -
Merging with conflicts
Autoplay
Rate The Course
Doing a three-way merge
Introducing remote repositories
Toggle Playlist?
Introduction
4 videos - 15min
1
Introducing Git
2min
2
Using the terminal and installing Git
3min
3
Preparing Git settings
5min
4
Making our first project directory
5min
Working with a local repository
4 videos - 19min
1
Creating (initializing) a repository
4min
2
Adding a file to our project
4min
3
Making our first commit
5min
4
Working with an existing project
6min
Branches
4 videos - 17min
1
What is a branch
4min
2
Making a commit on a branch
4min
3
Making a second branch
4min
4
Switching branches
5min
Merging
4 videos - 19min
1
Merging a branch
5min
2
Introducing vi/vim
3min
3
Doing a three-way merge
6min
4
Merging with conflicts
5min
Working with remote repository
5 videos - 20min
1
Introducing remote repositories
2min
2
Connecting to Github using SSH
7min
3
Adding a remote repository
4min
4
Pushing to a remote repository
4min
5
Updating a remote repository
3min
Working with others
5 videos - 30min
1
Working with others
7min
2
Fetching changes
4min
3
Working at the same time as others
7min
4
Rebasing Part 1
7min
5
Rebasing Part 2
5min
Exercises
3 videos - 15min
1
Exercise: Working with a local repository and branches
5min
2
Exercise: Merging
5min
3
Exercise: Remote repositories and working with others
5min
Claim Course Certificate
Discussions
Create A New New Topic