Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Language IDEs » PHP Development Tools (PDT) » Merge Conflict - Synchronized PHP Project
Merge Conflict - Synchronized PHP Project [message #1783520] Tue, 13 March 2018 18:51
Steve _____ is currently offline Steve _____Friend
Messages: 43
Registered: April 2012
Member

Eclipse 4.7.2

I have a Synchronized PHP Project in Eclipse.

For no reason apparent to me it stopped updating files on the server when I save the files.

In an effort to fix things I deleted my client side project meta files and the deleted the .ptp-sycn* folders on the remote server. I then recreated the project. Eclipse started dowloading the files and then stopped with an error dialog box complaining about a merge conflict. The dialog box had a button for a Merge Conflict View. When I pressed it nothing happened.

Any clues for resolving that conflict, avoiding future ones, and getting this project to automatically synch files?

Thanks.
Previous Topic:can't skip debug current instruction pointer
Next Topic:Termination of Debugging session hangs PDT
Goto Forum:
  


Current Time: Sat Nov 17 23:54:29 GMT 2018

Powered by FUDForum. Page generated in 0.01690 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top