> When merging fixes and features into master, we avoid merge commits and use rebases and fast-forward as much as possible.
Rebasing feature branches, and avoiding non-ff merges has been the best change I've ever made to my workflow. Makes it very easy to keep a clean, readable history that is actually useful when doing code archeology months later. Resolving conflicts is far easier than via merging too.
> When merging fixes and features into master, we avoid merge commits and use rebases and fast-forward as much as possible.
Rebasing feature branches, and avoiding non-ff merges has been the best change I've ever made to my workflow. Makes it very easy to keep a clean, readable history that is actually useful when doing code archeology months later. Resolving conflicts is far easier than via merging too.