![]() We’re now going to explore how to achieve a state in the local branch where the remote won’t reject the push. How can you get your local branch back to a state that’s pushable? These 2 cases should be dealt with differently. There tend to be 2 types of changes to the remote branch: someone added commits or someone modified the history of the branch (usually some sort of rebase). “the tip of your current branch is behind its remote counterpart” means that there have been changes on the remote branch that you don’t have locally. Remotes are useful to share your work or collaborate on a branch. a GitHub/GitLab/BitBucket/self-hosted Git server repository instance). A remote equates roughly to a place where you git repository is hosted (eg. A remote branch is one that exists on the remote location (most repositories usually have a remote called origin). A local branch is a branch that exists in your local version of the git repository. Git works with the concept of local and remote branches. 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.What causes ”tip of your current branch is behind”? 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 |