loading...
re: Gross merge commits out of master? No... those merge commits are telling an important story. It's incredibly easy to hide them if you don't want to...
 

Thanks for your input, Joe! I'll try to address some of your concerns in the next git post, whenever that comes along.

 

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.

Code of Conduct Report abuse