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

db iamsudo at gmail.com
Tue Oct 10 15:48:25 UTC 2017


On 10 Oct 2017, at 17:42, "Daniel J. Luke" <dluke at geeklair.net> wrote:
> If the OP does have a need to be syncing from the git repository, he should be able to manage any conflicts like this without help from the list.

As I said, I didn't modify the checkout.


More information about the macports-users mailing list