DEV Community

Discussion on: Pick. Squash. Drop. Rebase! (Comic)

Collapse
 
nikoheikkila profile image
Niko Heikkilä

I can recommend rebasing when working in a team. Keeps the history so much cleaner!

Additionally, in my team, we use a lot of fixup (squash the commit but keep the message) and reword (change the commit message but keep the content) when doing interactive rebasing. Both are very valuable prior to push or merge.

Collapse
 
jwp profile image
John Peters

What's the difference between rebase and merge with master?

Collapse
 
nikoheikkila profile image
Niko Heikkilä

Atlassian has this covered better than I could put in words. Read on!