DEV Community

Discussion on: 6 Git Aha Moments

Collapse
 
henrikwarne profile image
Henrik Warne

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.