News for hackers. Stuff that matters.
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

Re:Things I wish everyone knew about Git (Part II) by IshKebab on Wednesday July 20, 2022 @08:05AM (#32164531)
Not true because commit parents are ordered. One of them is first - the main parent.
Re:Things I wish everyone knew about Git (Part II) by shikoba on Wednesday July 20, 2022 @08:12AM (#32164610)
It's a detail. But for some people it looks like it changes everything.