[cctbxbb] Massive commit just now

[Graeme.Winter at diamond.ac.uk]

Thinking some more about this, maybe it would be good practice in the future for large merges, say 10 or more commits, and merges from long-standing branches to create a pull request, and leave that for a couple of working days so that other people can have a look first and comment on how to proceed. In general squashing of commits (turning many related commits into fewer commits) should be encouraged before merging. I appreciate here that James had asked people to check out the branch which I had, and run the tests...

A potential rule of thumb for this could be: If the commit is so small as to not have a helpful commit message ('bugfix', 'typo', '... part 1', '... part 2') then it should be squashed together with closely related other commits. Would mean when we are reviewing this in a year to work out where something went wrong, it's easier to track down the important commits....

What do people think?

Thanks Graeme

-- 
This e-mail and any attachments may contain confidential, copyright and or privileged material, and are for the use of the intended addressee only. If you are not the intended addressee or an authorised recipient of the addressee please notify us of receipt by returning the e-mail and do not use, copy, retain, distribute or disclose the information in or attached to the e-mail.
Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd. 
Diamond Light Source Ltd. cannot guarantee that this e-mail or any attachments are free from viruses and we cannot accept liability for any damage which you may sustain as a result of software viruses which may be transmitted in or with the message.
Diamond Light Source Limited (company no. 4375679). Registered in England and Wales with its registered office at Diamond House, Harwell Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom