[cctbxbb] Making branches by accident

markus.gerstel at diamond.ac.uk markus.gerstel at diamond.ac.uk
Thu Dec 15 04:04:53 PST 2016

So I got lost at the 'revert this merge' bit. How do I get back to the central line?

Assuming that all those merges are intentional.... can we maybe agree that merging branches instead of rebasing onto master only makes sense when they are at least so long lived that the author bothered to upload them to github?


From: cctbxbb-bounces at phenix-online.org [cctbxbb-bounces at phenix-online.org] on behalf of Graeme.Winter at diamond.ac.uk [Graeme.Winter at diamond.ac.uk]
Sent: Wednesday, December 07, 2016 08:02
To: cctbxbb at phenix-online.org
Subject: [cctbxbb] Making branches by accident

Morning all

I am seeing a certain amount of “Merge branch 'master' of github.com:cctbx/cctbx_project” coming through on the commits – this usually means you did not do a git pull –rebase before the git push. This can be set to the default by using the spell Markus sent out

git config --global pull.rebase true

This will need to be done on each machine you push from, else getting the habit of doing a git pull –rebase before push is a good one.

We have had this on and off with DIALS but it tends to pass easily enough.

What bad happens? Nothing really but the history becomes confusing…

So:  may be worth checking that you have the pull.rebase thing set?

Cheerio 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 --------------
A non-text attachment was scrubbed...
Name: Screenshot-3.png
Type: image/png
Size: 6955 bytes
Desc: Screenshot-3.png
URL: <http://phenix-online.org/pipermail/cctbxbb/attachments/20161215/fbf664ed/attachment.png>

More information about the cctbxbb mailing list