Git: unable to get remote and local/server the same

Question

git status on the server returns:

On branch develop
Your branch is ahead of 'origin/develop' by 14 commits.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean

My goal is to get the git branch on gitlab.com and on the server synchronized. When I look at the difference between the two, the commits that it states that remote on the server is ahead, are commits I believe are actually there on gitlab.com.

I did the following on the server:

git status returns "Your branch is ahead of 'origin/develop' by 14 commits."
git reset --soft HEAD~1
git status now returns "branch is up-to-date with origin/develop. Changes to be committed:" and then a list with changes.
git reset --hard
git status now returns "branch is up-to-date with origin/develop. Nothing to commit."
git log is missing the latest commits and therefore essentially disagrees with step 5.
git pull origin develop This pulls various changes (how is that possible since step 5 returns "up-to-date"...?).
git status returns the original message "ahead of 'origin/develop' by 14 commits" and I'm back where I started.

I don't understand this. How can the server return to being ahead of gitlab.com (step 8) after pulling from gitlab...? I removed all changes on the server and just did a pull...

Use git log origin/develop.. to see the new commits. Yes, with 2 dots. — phd
– phd, Commented May 11, 2020 at 15:48
If after step 5 I enter git log origin/develop.., this returns nothing, not even a blank line... And if I do it after step 7, it returns a list of commits that are on gitlab.com, so I don't see why it would consider the server to be ahead these commits in comparison to gitlab.com (after all, it just pulled them from gitlab.com). — Nick
– Nick, Commented May 11, 2020 at 17:55
perhaps you forgot to fetch data from remote (as far as I remember git status compare with a local version of the branch)? git fetch -> git pull OR git pull -f (in case of the branch name the same) — Evgeniy
– Evgeniy, Commented May 11, 2020 at 18:11
Keep in mind that when git status says "Your branch is ahead of 'origin/develop' by 14 commits", it is not looking at gitlab. It is looking at a local branch, a tracking branch which may not be up to date with what's on gitlab. — Also I'm confused by your statements "git status on the server" and "I did the following on the server"... really? You gave those commands through ssh or something? Why would you ever do such a thing? — matt
– matt, Commented May 11, 2020 at 18:14
Thanks for explaining. But then still, how should I synchronize the two? — Nick
– Nick, Commented May 11, 2020 at 18:16

matt · Accepted Answer · 2020-05-11 18:55:17Z

git status returns "Your branch is ahead of 'origin/develop' by 14 commits."

This does not mean that your branch is ahead of the remote (origin). origin/develop is a local branch. It is a remote tracking branch, but it is not updated automatically. The way to update it is to say git fetch — something that you never report having said.

git reset --soft HEAD~1

git status now returns "branch is up-to-date with origin/develop. Changes to be committed:" and then a list with changes.

git reset --hard

git status now returns "branch is up-to-date with origin/develop. Nothing to commit."

git log is missing the latest commits and therefore essentially disagrees with step 5.

I don't know why you did any of that. You chopped off a bunch of commits from develop. Why would you deliberately lame your local branch?

Also, you are wrong about 6: having lamed develop, you have caused it to agree with origin/develop, which is still sitting there unchanged. They are absolutely in agreement.

git pull origin develop This pulls various changes (how is that possible since step 5 returns "up-to-date"...?).

It's possible because, once you have lamed develop, the remote is ahead of you. So you pull from the remote, and now your develop gets the commits from the remote that you just chopped off it.

git status returns the original message "ahead of 'origin/develop' by 14 commits" and I'm back where I started.

Because you still have not updated origin/develop by saying git fetch.

So basically you've gone around in circles because (a) you don't know what origin/develop is and (b) you keep not updating origin/develop. Update it! Say git fetch, and you will then discover through git status what the actual situation is. I suspect that you will find that you are completely up to date and all is well.

Collectives™ on Stack Overflow

Git: unable to get remote and local/server the same

1 Answer 1

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related