25 - Learn Git and GitHub from Scratch - 2 | What is a Branch? What is a Merge? How to Resolve a ...
Hello everyone,
In this video, which is a continuation of the previous video, #24, we continue the topic of Git. If you haven't watched it, I recommend starting with that. In this video, I cover the topic of "branch" and do various exercises with multiple branches.
Topics covered in the video:
What is a branch? What are the differences between branches? How do you create a new branch?
What is a merge and how do you merge code from different branches?
What is a conflict, why does it occur, and how can it be resolved?
How can you track code change history with Git history?
What is the function of the .gitconfig file?
As in the previous video, we use the VSCode editor and the GitHub interface to further enhance our overall Git knowledge.
Git commands we learned in the video:
git branch
git checkout
git config
Links I used:
GitHub repository: https://github.com/ada88/demo-java-pr...
Git installer: https://git-scm.com/downloads/win
VSCode installer: https://code.visualstudio.com/Download
00:00 What is a branch?
07:00 Creating and switching branches
08:40 Pushing a new branch to a remote
10:12 Entering code into the new branch
12:05 What are merge and pull requests?
15:41 What causes conflict and how to resolve it
21:20 Git history and Git config
23:54 .gitconfig file
25:05 Closing