[ptp-user] synchronisation trouble

["Biddiscombe, John A." <biddisco@xxxxxxx>]

Help! My project has stopped synchronising – If I disable one subfolder in the filters, then synchronise, it shows this
When I re-able the folder (which I suspect to be causing trouble), the message goes away, but no syncing takes place
I’ve gone into the remote and local workspaces and done a GIT_DIR=.ptp-sync then I can see everything is fine with no signs of conflict

In the remote merge window things, nothing appears (In the past conflicts appear here and I can resolve them).

How can I reset my local workspace to match the remote one (which is right) without wiping all and restarting?

Thanks

JB


[cid:29CF4478-1DA8-449C-BFD1-D808BD87FE40]