Hacker News new | ask | show | jobs
by CuriousCosmic 1811 days ago
Yep I agree. I tend to rebase my feature branches into a sensible history and then merge that in as I find that leaves the cleanest history that is still easily navigable.

I wish this workflow was better supported but since it isn't most people just default to squash and merge or rebase and merge.