3 ms·
I used to be a solid believer in merging and not rebasing, but then I had the chance of working on a project where rebase + fast forward only merges were the no
by haspok 3y ago
I used to be a solid believer in merging and not rebasing, but then I had the chance of working on a project where rebase + fast forward only merges were the norm (with some additional rules), and I have to admit, it worked really well. I don't even remember any serious merge conflicts, and there were some really long lived branches there!
- mattpallissard 3y agoI usually can sell rebase+FF to a team by using rev-parse to revert a range of commits immediately without conflict. It's a little more effort to get in the habit of, but it pays dividends.