[cctbxbb] please read before your next commit

[markus.gerstel at diamond.ac.uk]

Good morning,

recently a couple of large files were erroneously committed to the cctbx repository and then deleted thereafter. Git always keeps a full history, so to avoid cruft aggregating over time we decided to cut those files out of the repository history. Unfortunately this means everyone will have to do a couple of steps:


1.       Please ensure you have run libtbx.git_avoid_merges on all of your development machines

2.       Run git pull --rebase the next time you update your repository instead of git pull - again, do this on all development machines.

3.       If you keep any local branches you may need to rebase them onto master (git fetch; git checkout $branchname; git rebase origin/master)

If you don't follow these instructions you may end up recommitting those large files, and we have to start again.

Thanks

-Markus


-- 
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/20170627/7e788e76/attachment.htm>