Re:Things I wish everyone knew about Git (Part II)
by shikoba on Wednesday July 20, 2022 @05:59AM
(#32163521)
The idea of "merging into" has no meaning with git. You're merging two things into one. But saying that there are a master thing and a slave thing has no meanings.
Re:Things I wish everyone knew about Git (Part II)
by andreareina on Wednesday July 20, 2022 @06:07AM
(#32163575)
git does privilege the first parent[1] in a merge in a bunch of contexts
[1] i.e. the branch you did the merge from
"git pull" in the kernel workflow is for integrating downstream changes into your own upstream repository. Meanwhile, "git pull" in the everyman workflow is for synchronizing your local changes with upstream changes (you know, re-basing your patches on upstream or something).
Even the merge commits left behind by default git pull reveal this. "Merge branch master of ssh://yourorg-git/upstream" - completely backwards for what you are doing - you're merging the upstream into the downstream? What, your local repo is the boss now? Doesn't make any sense.