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

Reminder of the command to be issued from the cctbx git repo:

git config pull.rebase true

(unless you are using a hopelessly outdated version of git)