Re: [ptp-user] synchronisation trouble

[John Eblen <jeblen@xxxxxxx>]

Hi

Try manually changing the local and remote so that files are identical. Sync should then be
able to resume. This may be caused by a known bug, where filter changes are not updated:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=423370

John

On Tue, Feb 4, 2014 at 12:22 PM, Biddiscombe, John A. <biddisco@xxxxxxx> wrote:

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]

_______________________________________________
ptp-user mailing list
ptp-user@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-user