From: Douglas C. <dcl...@cy...> - 2017-06-03 16:10:27
|
On Sat, Jun 3, 2017 at 5:15 AM Jeff Allen <ja...@fa...> wrote: > Git gives us a lot of possibilities for squeezing out, at the PR stage or > before, the noise-commits caused by merges and development choices later > reverted. But let's only squash things together that belong together, and > not be afraid to show key points on the journey to a feature if it aids > others. This would all make reviewing a change easier. > I have only contributed a few patches to Jython, but I have used git extensively for many years. I think Jeff's summary here is exactly the right approach: expect developers to clean up the noise and the false starts, but keep the "key points" that make the change intelligible to others. Github's squash merges flatten everything down, regardless of whether that clarifies or confuses the nature of the change. Learning how to do the "interactive rebase" for this definitely has a learning curve, but it pays off pretty quickly in keeping the history understandable. Doug |