Now Playing - Merging with conflicts

Autoplay

Rate The Course

Doing a three-way merge Introducing remote repositories

Toggle Playlist?

Introduction

4 videos - 15min

1Introducing Git2min 2Using the terminal and installing Git3min 3Preparing Git settings5min 4Making our first project directory5min

Working with a local repository

4 videos - 19min

1Creating (initializing) a repository4min 2Adding a file to our project4min 3Making our first commit5min 4Working with an existing project6min

Branches

4 videos - 17min

1What is a branch4min 2Making a commit on a branch4min 3Making a second branch4min 4Switching branches5min

Merging

4 videos - 19min

1Merging a branch5min 2Introducing vi/vim3min 3Doing a three-way merge6min 4Merging with conflicts5min

Working with remote repository

5 videos - 20min

1Introducing remote repositories2min 2Connecting to Github using SSH7min 3Adding a remote repository4min 4Pushing to a remote repository4min 5Updating a remote repository3min

Working with others

5 videos - 30min

1Working with others7min 2Fetching changes4min 3Working at the same time as others7min 4Rebasing Part 17min 5Rebasing Part 25min

Exercises

3 videos - 15min

1Exercise: Working with a local repository and branches5min 2Exercise: Merging5min 3Exercise: Remote repositories and working with others5min

Claim Course Certificate

Discussions

Create A New New Topic