[SOLVED] git: Your branch and 'origin/master' have diverged, and have 1 and 3 different commits each, respectively.

MakeTopSite · 11-09-2023, 01:15 AM

... after I had removed last 3 commits and pushed to remote:

Code:

git reset HEAD^ --hard
git reset HEAD^ --hard
git reset HEAD^ --hard
git push https://gitlab.com/myname/myproj  -f

Code:

git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 3 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean

What will happen please if I run

Code:

git pull

?

NevemTeve · 11-09-2023, 07:34 AM

You can find out: just copy the whole directory-structure and try `git pull` on the copy.

dugan · 11-09-2023, 09:00 AM

If you’re worried, you branch from your branch, and then do the pull.

(I assume you didn’t actually want an easily googlable explanation of how merges work?)

MakeTopSite · 11-12-2023, 02:40 AM

Quote:

Originally Posted by NevemTeve

You can find out: just copy the whole directory-structure and try `git pull` on the copy.

Thank you, output of

Code:

git pull

was empty but it has solved the problem.

MakeTopSite · 11-12-2023, 02:49 AM

Quote:

Originally Posted by dugan

If you’re worried, you branch from your branch, and then do the pull.

(I assume you didn’t actually want an easily googlable explanation of how merges work?)

When I find some stuff about git command and use it, the result is sometime different than expected. And the difference is usualy undesirable and require another fix which requires another searching of the web. (This is why I had to remove last 3 commits and pushed to remote.) So I wanted to ask to be sure so as not to make things even worse.

sundialsvcs · 11-12-2023, 09:51 PM

Git was telling you that it thought that the remote branch had commits that you didn't have, and that you had commits that the remote didn't have. It was instructing you to "pull" the remote commits down, so that what you then "pushed" would consider those commits and thus maintain the proper sequence.

– – –

It's very important to remember that Git considers everyone's system to be "a repository." The true genius of this system is that: "there is no 'one authoritative source of truth – there is no 'server.'"

Instead – and this will save your a&s!! – "everyone is 'a backup.'"

Naturally, there are certain specific "agreed-upon 'authoritative sources'" that are very carefully maintained – through "pull requests" and so-forth – but the central concept is still grounded in "mutual synchronization." Which happens to be an idea that had never been done before . . . ("Typical Linus ...") "Your repository is 'not in-sync' with theirs, because you have updates they don't have, and they have updates you don't have." Git provides a very straightforward way to deal with that.

But, for the individual developer working on his own machine, "effective version control." No 'server,' no mess, no bother. "Oh sh&t, I just screwed up ..." Solution: "Poof!" ... ... "Oh sh&t, I actually didn't screw up ..." Again: "Poof!"

I can very-confidently tell you that there is not a single "project directory," on any one of my (fairly recent ...) personal systems, which isn't 'a Git repository.' That's the brilliance of the whole thing.

NevemTeve · 11-13-2023, 01:10 AM

Quickstart:
https://xkcd.com/1597/
https://explainxkcd.com/wiki/index.php/1597:_Git