7 ms·

So 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 ago
  Correct.
  • cutemonster 6y ago
    Thanks