A simple explanation of GIT and merge conflicts in under 4 minutes.
We have all been in situations where we listened to software engineers and didn’t understand what they were talking about. In this video, you will learn what git, commit, merge conflict, and rebase are.
Further reading
Git Official Website:
https://git-scm.com/
freeCodeCamp Git Basics:
https://www.freecodecamp.org/news/lea...
Atlassian Git Tutorial:
https://www.atlassian.com/git/tutoria...
Outline:
00:00 - Introduction
00:36 - What is Git
00:50 - Git is not Github, GitLab or Bitbucket
01:01 - How does Git work
01:19 - Collaborating on a document
01:41 - Git is structured like a tree
01:53 - Merge/pull request
02:11 - Merge conflict
02:31 - Resolve conflict manually
02:43 - Rebase
02:54 - Benefits of using Git
03:11 - Summary
03:30 - Outro