Totally agree. This post wasn’t meant to persuade people to use one or the other just explaining the differences since they are so similar!
It's always good to point out the consequences of got commands that rewrite history, so people are aware of it.
You did a good thing. Honestly merge is abused and results in sloppy histories. I put --ff-only in my gitconfig to prevent accidental merge bubbles.
--ff-only
gitconfig
It's good for people to get more comfortable rebasing and pay attention to keeping the log clean--especially on larger teams
A final note--its best to rebase -i before pushing
rebase -i
What does your final note do?
Rebase -i let's you squash and amend commits
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
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.
Totally agree. This post wasn’t meant to persuade people to use one or the other just explaining the differences since they are so similar!
It's always good to point out the consequences of got commands that rewrite history, so people are aware of it.
You did a good thing. Honestly merge is abused and results in sloppy histories. I put
--ff-onlyin mygitconfigto prevent accidental merge bubbles.It's good for people to get more comfortable rebasing and pay attention to keeping the log clean--especially on larger teams
A final note--its best to
rebase -ibefore pushingWhat does your final note do?
Rebase -i let's you squash and amend commits