On 10 Oct 2017, at 15:17, Chris Jones <jon...@hep.phy.cam.ac.uk> wrote: > So one or more of those modifications are your problem. The modifications in > your checkout conflict with something coming in from the sync. You need to > resolve these conflicts before trying again.
I didn't modify the checkout: I installed base from source four days ago, synced, upgraded and now cannot sync. I installed that same source on a VM and it syncs normally. I don't know why git status is listing those modifications.
