loading...

Discussion on: ELI5: Git Rebase vs. Merge

Collapse
tonymet profile image
Tony Metzidis

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

Thread Thread
misterhtmlcss profile image
Roger K.

What does your final note do?

Thread Thread
tonymet profile image
Tony Metzidis

Rebase -i let's you squash and amend commits