Learning Paths Contact Us Pricing

Search for a course

Create account Sign in Learning Paths Contact Us Pricing All courses Full Stack Learning Path Playgrounds

Autoplay

Contents

Merging with conflicts

101 views • Jul 2, 2020

Introduction

4 videos 2 exercises - 25min

1. Introducing Git 2min 2. Using the terminal and installing Git 3min 3. Check git version 5min 4. Preparing Git settings 5min 5. Adding git config settings 5min 6. Making our first project directory 5min

Working with a local repository

4 videos 4 exercises - 31min

7. Creating (initializing) a repository 4min 8. Quiz 1min 9. Initializing a git repository 5min 10. Adding a file to our project 4min 11. Making our first commit 5min 12. Working with an existing project 6min 13. Making first commit 5min 14. Quiz 1min

Branches

4 videos 1 exercises - 22min

15. What is a branch 4min 16. Making a commit on a branch 4min 17. Making a second branch 4min 18. Switching branches 5min 19. Building a mini branch project 5min

Merging

4 videos - 19min

20. Merging a branch 5min 21. Introducing vi/vim 3min 22. Doing a three-way merge 6min 23. Merging with conflicts 5min

Working with remote repository

5 videos 3 exercises - 27min

24. Introducing remote repositories 2min 25. Connecting to Github using SSH 7min 26. Adding a remote repository 4min 27. Quiz 1min 28. Pushing to a remote repository 4min 29. Quiz 1min 30. Updating a remote repository 3min 31. Pushing your project to GitHub 5min

Working with others

5 videos 1 exercises - 31min

32. Working with others 7min 33. Fetching changes 4min 34. Working at the same time as others 7min 35. Rebasing Part 1 7min 36. Rebasing Part 2 5min 37. Quiz 1min

Exercises

3 videos 3 exercises - 30min

38. Exercise: Working with a local repository and branches 5min 39. Lab on working with a local repository and branches 5min 40. Exercise: Merging 5min 41. Lab on merging 5min 42. Exercise: Remote repositories and working with others 5min 43. Lab on remote repositories and working with others 5min

Claim Course Certificate

Git Learning Journey - Learn Git (Version Control)

Leaving a rating would help us curate better content for everyone who learns about the course. Select a rating out of 5 stars and let us know a bit what you think about the course in a few words.

Your rating would be public.

0.5 Stars1 Star1.5 Stars2 Stars2.5 Stars3 Stars3.5 Stars4 Stars4.5 Stars5 Stars

(0/5)

Write a few sentences about your experience so far.