Note: This the seventh video in the Git for beginners series. Watch the first video here.
Imagine there are parallel worlds. We have:
- A world where I have created this video, and you’re watching it.
- A world where I have created this video, but you’re not watching it.
- A world where I did not create this video.
In this parallel world concept, a Git branch is a parallel world.
You can have a branch that stays the same in one world. Then, you branch off into a different world. Once you finish your code, you can complete the initial world by merging the changes into it.
I want to let you know that I’m changing to a new refund policy. I want to tell you about the new policy, and why I’m changing it.
Note: This the sixth video in the Git for beginners series. Watch the first video here.
Let’s say a friend of made a change to your repository and pushed the changes to the Git remote. At the same time, you also made a change to the same line of code.
When you pull their changes into your local repository, you’ll notice that there is a conflict.
This happens because Git no idea whether their version is the updated version or your version is the updated version.
This is what we call a Git conflict.
You’ll learn how to resolve a Git conflict today.
I made a terrible mistake when I tweeted about
:blank a month ago. I said that
:empty wasn’t useful, and
:blank is much more useful than
I was wrong!
:empty is actually good enough. We don’t even need
Note: This the fifth video in the Git for beginners series. Watch the first video here.
Let’s say you want to work on a project together with a friend. The two of you will be creating commits on the same project.
Let’s also say your friend has created the project. They initialized a repository on Github.
What you need to do next is to copy the project from the remote to your computer.
In Git, you can do this through a Git Clone.
And as professional frontend developers, we need to understand what our jobs are.
Note: This the fourth video in the Git for beginners series. Watch the first video here.
When you make a change to a local repository, you can push a change to a Git remote. Likewise, when the remote gets changed, you can pull the changes back to your local repository.
Today, you’ll learn how to do the pull from the remote back to your repository.
Let’s say you want to teach a person something. Why does the person not understand what you’re saying?
One of the main reasons is because we like to use big words and industry jargons. These jargons may mean something to us, but they mean nothing to the people we’re trying to teach.
The next time you try to teach programming, watch out for the words you use.
Note: This the third video in the Git for beginners series. Watch the first video here.
In Git terminology, we call the Git repository on your computer a local repository.
A Git remote is the same repository stored somewhere else on the internet. It can serve as a backup. If your computer crashes, you can always get the latest version from the remote back onto your computer.
People feel that programming is abstract because they don’t have a proper hook to understand it yet. Programming can become real and relatable once a proper hook is installed.
This hook comes in the form of analogies.