The problem with "first-parent" is that you have to always merge branches into master (i.e never call git merge master). This works great with what the article said about rebasing master onto your branches. I do not get the last point of how git would not create a merge commit if your branch is up to date with master. I know git does this with fast-forward, but do not understand how it would work with a branch that was up to date due to rebasing.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
The problem with "first-parent" is that you have to always merge branches into master (i.e never call git merge master). This works great with what the article said about rebasing master onto your branches. I do not get the last point of how git would not create a merge commit if your branch is up to date with master. I know git does this with fast-forward, but do not understand how it would work with a branch that was up to date due to rebasing.