| Merge Conflict - Synchronized PHP Project [message #1783520] |
Tue, 13 March 2018 14:51 |
Eclipse User |
|
|
|
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.
|
|
|
Powered by
FUDForum. Page generated in 0.09546 seconds
Home