Hi
While in mercurial «hg fetch» is equivalent to «hg pull» and «hg merge»
it seems that «git pull --no-ff» is not equivalent to
«git fetch» and «git merge».
I run an experiment. Set up a local git server, with a couple of commits.
Cloned it as user1
cloned it as user2
User1 pushes a (non conflicting) commit to the server
now user2 has either to pull --no-ff or fetch+merge.
- Here is the graph before the pull/fetch
git log --graph --all
* commit b178f66fa7cf7759c880ac6e4f388cf5fc590075 (HEAD -> default)
| Author: Uwe Brauer <o...@mat.ucm.es>
| Date: Mon Jul 10 18:21:22 2023 +0200
|
| Uwe: Conflict RH is FALSE
|
* commit 4da587290a2c7024c904d4f4f34420f4a65058b2 (origin/default, origin/HEAD)
| Author: Uwe Brauer <o...@mat.ucm.es>
| Date: Mon Jul 10 18:20:17 2023 +0200
|
| 5: Six
- here the result of git fetch + merge
* commit 063fc6ee19092ae10418064c857d2ff485425dfd (default) (HEAD -> default)
|\ Merge: b178f66 d4a687d
| | Author: Uwe Brauer <o...@mat.ucm.es>
| | Date: Mon Jul 10 18:25:15 2023 +0200
| |
| | Merge commit 'd4a687dcb' into default
| |
| * commit d4a687dcb8137f5770fc2bd61beb3552ec8bbb1b (remotes/origin/HEAD)
(origin/default, origin/HEAD)
| | Author: Bernhard Riemann <berniegmail.com>
| | Date: Mon Jul 10 18:21:43 2023 +0200
| |
| | Bernhard, Conflict RH is TRUE
| |
* | commit b178f66fa7cf7759c880ac6e4f388cf5fc590075 (default~1)
|/ Author: Uwe Brauer <o...@mat.ucm.es>
| Date: Mon Jul 10 18:21:22 2023 +0200
|
| Uwe: Conflict RH is FALSE
This is what I expect from git pull --no-ff
However I obtain
* commit ca8e85ecab893b1a801e99b916e4274989928a6c (default) (HEAD -> default)
| Author: Uwe Brauer <o...@mat.ucm.es>
| Date: Mon Jul 10 18:27:32 2023 +0200
|
| Uwe: Conflict RH is FALSE
|
* commit 6e8161026dc63f14e250e0eeae14295066de5b34 (remotes/origin/HEAD)
(origin/default, origin/HEAD)
| Author: Bernhard Riemann <berniegmail.com>
| Date: Mon Jul 10 18:27:17 2023 +0200
|
| Bernhard, Conflict RH is TRUE
|
What do I miss here?
Thanks and regards
Uwe Brauer
--
Warning: Content may be disturbing to some audiences
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the NATO membership of the Ukraine.
I support the EU membership of the Ukraine.
https://addons.thunderbird.net/en-US/thunderbird/addon/gmail-conversation-view/
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/87wmz74tmb.fsf%40mat.ucm.es.
smime.p7s
Description: S/MIME cryptographic signature
