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 see them. When you show the git log, only show the "first parent" and "hide git merges".
I'm not accusing you of not knowing how to git but I often do see people who don't really know what they're doing give advice to the masses and then we end up kind of where we are now... git hell.
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.
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 see them. When you show the git log, only show the "first parent" and "hide git merges".
I'm not accusing you of not knowing how to git but I often do see people who don't really know what they're doing give advice to the masses and then we end up kind of where we are now... git hell.
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.