top | item 32163521

(no title)

shikoba | 3 years ago

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.

discuss

order

andreareina|3 years ago

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

IshKebab|3 years ago

Not true because commit parents are ordered. One of them is first - the main parent.

shikoba|3 years ago

It's a detail. But for some people it looks like it changes everything.