Git says my repository is up-to-date but actually it is not

Question

There are two git repos in two machines.

Though from the same origin previously, they are different actually because my friend and I operate on them differently afterwards.

Now here is the problem.

I tried to pull from the other repo and I use:

git pull origin master

origin is my friend repo, which is located on the same local network. master is his main branch.

But git says my repo is already up-to-date.

They are different with different log info , different commit info and of course files.

So what maybe the cause? And how can I deal with it?

I suspect you may not be tracking the other remote - try git branch -vv --list master. The output will contain something like "master 450db23 [origin/master: behind 10] ....commit description...". If you are not tracking origin/master, you can fix that using "git branch --set-upstream master origin/master" — patthoyts, Mar 23 '12 at 10:10

score 1 · Answer 1 · edited May 23 '17 at 12:11

1

Check if you are in a branch (instead of a detach HEAD)

See if the result of git branch returns a current branch (marked with a '*')
If so, see "Git Push Issues".

edited May 23 '17 at 12:11

Community

answered Mar 23 '12 at 07:58

VonC

1 Answers1