[cctbxbb] Massive commit just now

[Graeme.Winter at diamond.ac.uk]

Folks,

Earlier a branch which was fairly long lived was merged in perhaps a non-ideal way, apparently replaying every commit from around July to now. While this is confusing and has (a little) messed with history, it has not actually broken anything...

However, if you have a big branch you want to merge, I think a pull request makes this a little more obvious

Just some background to what happened...

Cheers 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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://phenix-online.org/pipermail/cctbxbb/attachments/20170908/d02acad3/attachment.htm>