cannot sync - pulling is not possible because you have unmerged files

[Chris Jones]

run 'git diff' on the changes to see if anything rings a bell.

Failing that I have no idea. I have never had conflicts like that apart 
from when I had uncommitted changes.

Maybe you could run

 > sudo port -d sync

and post what that says. It should contain a bit more debug..

On 10/10/17 16:05, db wrote:
> On 10 Oct 2017, at 15:17, Chris Jones <jonesc at 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.
>