3 ms·
That's not completely true. There's an order to the parents of a merge commit, and by convention the first parent is the one that was merged "into".
by nemetroid 6y ago
That's not completely true. There's an order to the parents of a merge commit, and by convention the first parent is the one that was merged "into".
- cutemonster 6y agoSo if I'm on master, and 'git merge feature-x', then the parent commit on the master branch will be the first parent? (Not the feature-x last commit)
- nemetroid 6y agoCorrect.
- cutemonster 6y agoThanks