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

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

Not true because commit parents are ordered. One of them is first - the main parent.
It's a detail. But for some people it looks like it changes everything.