> On 22 May 2016, at 14:24, Daniel Sank <sank.dan...@gmail.com> wrote: > > All, > > > Please do not use squash commits. See > > http://mjg59.dreamwidth.org/42759.html. > > Squashing commits is essential to making useful commit histories. Are you > just saying not to use Github's built-in feature which squashes everything > into a _single_ commit? If so, note that you can turn that GUI feature off so > nobody is tempted to use it. That does leave the question of whether you want > people to use merge commits or to rebase their branch on the latest master > before merging so that you always get a fast-forward. >
The thing is that we don't want fast-forward; fast-forward merging creates awful commit histories with no regard to branches, especially for ones like Twisted where (near) every commit on trunk needs to be a deployable one, and where we may need to revert an entire branch. - Amber
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ Twisted-Python mailing list Twisted-Python@twistedmatrix.com http://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-python
