是否需要git pull和merge才能从远程存储库获取最新更新？

Question

After I pushed my work to the feature branch of a remote repository, someone merged it to the main branch.

Since then, I haven't made any change to my local working directory and local repository and the remote repository, while others have made changes to the remote repository.

Now I want to get the latest work from the remote repository,

• is git pull the correct command?
• will I not need to merge, because my last commit is an ancestor of the current commit on the main branch?

Running git pull doesn't succeed. The output of running git pull contains the following

There is no tracking information for the current branch. Please specify which branch you want to merge with. See git-pull(1) for details

 git pull <remote> <branch> 

If you wish to set tracking information for this branch you can do so with:

 git branch --set-upstream-to=origin/<branch> core-81 

What does it mean?

Thanks.

Answer 1

You need to switch to the main branch by running

git checkout master

change master to your main branch (for example development ). Then run git pull to get the latest work from the main branch.

The most general usage of git pull is

git pull origin branch

Where origin is the remote repository, and branch is the remote branch to pull information from. However, you can run

git push -u origin branch
# or
git branch -u origin/branch branch

This command ( -u stands for --set-upstream ) will set a remote branch as a tracking for this local branch and later on you will only need to run git pull for this branch

Answer 2

Description

Besically, if you haven't set up upstream for your branch - it will fail to pull ; simply because git has no idea where to pull from

In order to pull branch you are interested in you can run

git pull <remote> <branch>

Note: you can add -u here to set up upstream at this point

as git is suggesting to you in the output provided.

git branch --set-upstream-to <branch> <remote>/<branch>

This instruction will manually set up upstream for specified branch as in the above signature.

You can also set this up automatically when pushing by doing

git push -u <remote> <branch>

Note: -u sets up an upstream

EDIT 1

@torek

While git pull has a -u option, it simply passes it on to git fetch, where it means --update-head-ok. As the documentation says, "unless you are implementing your own Porcelain you are not supposed to use it." Note that this is quite different from git push -u, which you are supposed to use as needed.

Reference

6089294