2 ms·
"Merge, on the other hand, will attempt to create a merge commit. A merge commit is one that has two parents. In this case, the parents are the tip of the remot
by acqq 17y ago
"Merge, on the other hand, will attempt to create a merge commit. A merge commit is one that has two parents. In this case, the parents are the tip of the remote master and the tip of the local master."
Now what I understand from that is that "merge" (that is pull without rebase) should not be worse in any way!
In both scenarios git doesn't have less information to begin with, it doesn't start with any false assumption, it's just that without --rebase the resulting local repo is supposed to contain a bit more information.
Then why in the world is "pull --rebase" again "easy" to make the result and why is plain "pull" something that's "hard" to do for a beginner?
Now I think it must be some side effect of one or another that makes the whole story relevant?