News for hackers. Stuff that matters.
Re:Rebase and merge pull requests by whizzkid on Monday September 26, 2016 @11:39AM (#12582722)
> Just because the commits are fine as part of a branch doesn't mean you want to keep them as part of mainline.

Can you elaborate on this? I would be happy to learn more about it.

Re:Rebase and merge pull requests by scrollaway on Monday September 26, 2016 @12:17PM (#12583088)
Parent is missing the point that you were making, which is the benefit of not squashing vs. squashing.

What masklinn means is that when you just merge a PR, the history is retained as-is (same as with rebase). But instead of the history being flat, it's bumpy.

Re:Rebase and merge pull requests by masklinn on Monday September 26, 2016 @02:51PM (#12584540)
> Parent is missing the point that you were making, which is the benefit of not squashing vs. squashing.

I'm not missing any point, I'm saying you already get that benefit with the original merge strategy.