Y
Hacker News
new
|
ask
|
show
|
jobs
by
shikoba
1435 days 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.
2 comments
andreareina
1435 days 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
link
IshKebab
1435 days ago
Not true because commit parents are ordered. One of them is first - the main parent.
link
shikoba
1435 days ago
It's a detail. But for some people it looks like it changes everything.
link
[1] i.e. the branch you did the merge from