<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div><blockquote type="cite" class=""><div class="WordSection1" style="page: WordSection1; font-family: LucidaSans; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div style="margin: 0cm 0cm 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;" class=""><span style="font-size: 11pt;" class="">So: may be worth checking that you have the pull.rebase thing set?</span></div></div></blockquote><div><br class=""></div>Reminder of the command to be issued from the cctbx git repo:</div><div><br class=""></div><div>git config pull.rebase true</div><div><br class=""></div><div>(unless you are using a hopelessly outdated version of git)</div><div> </div><div><br class=""></div><div><br class=""><br class=""></div></body></html>