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

[Chris Jones]

OK, that didn't help much.

What is going wrong is clear. You have modifications in 
/opt/local/var/macports/sources/github.com/macports/macports-ports that 
are in conflict with the main repo and conflict when pulled in. *Why* 
you have these modifications, I cannot help you with...

Maybe you could just nuke the area, and reclone it from github... Before 
that though perhaps someone else has an idea.

Chris

On 10/10/17 16:29, db wrote:
> On 10 Oct 2017, at 17:20, Chris Jones <jonesc at hep.phy.cam.ac.uk> wrote:
>>> sudo port -d sync
> 
> $ sudo port -d sync
> Password:
> DEBUG: Copying /Users/user/Library/Preferences/com.apple.dt.Xcode.plist to /opt/local/var/macports/home/Library/Preferences
> --->  Updating the ports tree
> Synchronizing local ports tree from file:///opt/local/myports
> DEBUG: system: /opt/local/bin/portindex /opt/local/myports
> Creating port index in /opt/local/myports
> 
> Total number of ports parsed:	0
> Ports successfully parsed:	0
> Ports failed:			0
> Up-to-date ports skipped:	69
> 
> Synchronizing local ports tree from file:///opt/local/var/macports/sources/github.com/macports/macports-ports/
> DEBUG: euid/egid changed to: 0/80, env: HOME=/var/root SSH_AUTH_SOCK=/tmp/launch-9ytTKr/Listeners
> DEBUG: /opt/local/bin/git pull --rebase --autostash
> DEBUG: system -W /opt/local/var/macports/sources/github.com/macports/macports-ports: /opt/local/bin/git pull --rebase --autostash
> error: Pulling is not possible because you have unmerged files.
> hint: Fix them up in the work tree, and then use 'git add/rm <file>'
> hint: as appropriate to mark resolution and make a commit.
> fatal: Exiting because of an unresolved conflict.
> Command failed: /opt/local/bin/git pull --rebase --autostash
> Exit code: 128
> DEBUG: euid/egid restored to: 0/0, env restored
> DEBUG: command execution failed
>      while executing
> "system -W $dir $cmd"
>      (procedure "macports::UpdateVCS" line 1)
>      invoked from within
> "macports::UpdateVCS $cmd $dir"
>      ("uplevel" body line 2)
>      invoked from within
> "uplevel 1 $body"
> Syncing local Git ports tree failed
> DEBUG: Synchronization of 1 source failed
>      while executing
> "mportsync [array get global_options]"
> port sync failed: Synchronization of 1 source failed
>