re: 6 Git Aha Moments VIEW POST

TOP OF THREAD FULL DISCUSSION
re: I never merge ... you squash all the commits into one. I only ever rebase. Only. Ever. Rebase. Good luck! Paul
 

For small changes and short-lived branches (which are most common), I prefer rebasing. For long-running branches with really big changes (changing how a major feature works, changing a framework), I prefer merging.
Regardless, understanding that you can merge in both directions, and why that works, improves your knowledge of git.

code of conduct - report abuse