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

[Chris Jones]

what does

 > cd /opt/local/var/macports/sources/github.com/macports/macports-ports
 > git status

give ? (might need sudo on that last one)

On 10/10/17 14:04, db wrote:
> On 10 Oct 2017, at 14:48, Chris Jones <jonesc at hep.phy.cam.ac.uk> wrote:
>> Looks like you have made some modifications to the ports in your local git checkout which conflict with what is being pulled in during the sync.
> 
> I git clone'd master and built base, nothing more. It sync'ed a couple of days ago. Now, after building other ports, it doesn't sync anymore.
>