loading...

re: ELI5: Git Rebase vs. Merge VIEW POST

TOP OF THREAD FULL DISCUSSION
re: 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!
 

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.

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

What does your final note do?

Rebase -i let's you squash and amend commits

Code of Conduct Report abuse