> On Oct 18, 2018, at 7:40 AM, Dave Neuman <[email protected]> wrote:
>
> Hey All,
> I want to follow up on something that was briefly discussed at the summit
> this week. Many people do not like the Changelog and feel like it can be a
> PITA to deal with. One of the reasons we have the changelog is because
> there are so many commits in a given release, that it is hard to comb
> through all of them to figure out what noteworthy changes or bug fixes went
> into the code. One thing that may help with this problem is to use enable
> the squash and merge feature on Github for pull requests [1]. This
> feature would squash all commits in a PR into one commit. If we pair the
> one commit with a good commit message, we would essentially get the ability
> to create the changelog just from the commits.
Why not generate the ChangeLog from the actual PR “subject” line? Then it
wouldn’t matter if you have 1 or 100 commits for a particular PR. The Sorber
wrote a little script for ATS that generates our ChangeLogs *).
That much said, there’s another really good reason to squash: it makes back
porting / cherry-picking fixes a hell of a lot easier.
Cheers,
— Leif
*) https://github.com/apache/trafficserver/blob/7.1.x/CHANGELOG-7.1.5
>
> So, I would like to propose that we enable the squash and merge feature in
> the Traffic Control Github repo and use that going forward. Thoughts?
>
> Thanks,
> Dave
>
>
> [1] https://help.github.com/articles/about-pull-request-merges/
