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

[Daniel J. Luke]

On Oct 10, 2017, at 11:40 AM, Chris Jones <jonesc at hep.phy.cam.ac.uk> wrote:
> Maybe you could just nuke the area, and reclone it from github... Before that though perhaps someone else has an idea.

If the OP doesn't have a need to be syncing from the git repository, it would make sense to just change the config back to the default.

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.
-- 
Daniel J. Luke