![]() ![]() ![]() Just like a merge conflict that would happen between two different branches, these two different lines of history could contain changes to the same parts of the same file. Conflicts can occur in this way if you have new local commits, and new commits on the remote. One reason to do this may be that you expect conflicts. However, you may want to use git fetch instead. Git pull is the most common way to update your repository. git merge will update your current branch with any new commits on the remote tracking branch. git fetch updates the remote tracking branches. When you clone a repository, you clone one working branch, main, and all of the remote tracking branches. To understand what is and isn't affected by git pull, you need to first understand the concept of remote tracking branches. Git pull, a combination of git fetch + git merge, updates some parts of your local repository with changes from the remote repository. That's why git pull is one of the most used Git commands. git pull should be used every day you interact with a repository with a remote, at the minimum. Without running git pull, your local repository will never be updated with changes from the remote. So, from the above output we can see that we have switched to master branch and then pulled the remote's master branch using the git pull origin command and merged it into local master branch.Īfter the pull operation both the local master branch pointer and the remote master branch ( origin/master) pointer will point at the same commit as shown in the above image.Git pull is one of the 4 remote operations within Git. Remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 Remote: Compressing objects: 100% (2/2), done. Now we will run the git pull command which will fetch and merge remote master branch into local master branch. Your branch is up-to-date with 'origin/master'. So, first we will checkout the master branch. We can see that the local master branch is behind the remote master branch and so, we will pull the commits from remote to local. ![]() In the above image our local master branch is represented in blue and the remote master branch is represented in pink. And those changes are now merged into the master branch of the central repository. Lets say, other developers of our team have committed and pushed their changes to the central repository. Note! We have named the remote central repository connection as origin in our previous tutorial Git Remote - Connecting with repository. So, basically we are running two commands git fetch and git merge using git pull command. So, if we want to fetch and merge master branch from a remote repository into our local repository master branch then, we will first checkout master branch and we will run the git pull command and it will fetch the master branch from the remote repository and will merge it into the master branch of our local repository. We use the git pull command to fetch the commits from a remote repository to our local branch on which we are currently on and then merge the changes. So we fetch and merge commits using one command. The git pull command puts the two into one single command. So in the previous tutorial Git Fetch - Import commits from remote repository we learned how to fetch commits from remote repository using git fetch command and then merge the changes using git merge command. In this tutorial we will learn about Git pull which helps to fetch and merge changes. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |