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

[db]

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.