Eclipse Community Forums: PHP Development Tools (PDT) » Merge Conflict

Help

Home

Home » Language IDEs » PHP Development Tools (PDT) » Merge Conflict - Synchronized PHP Project

Show: Today's Messages :: Show Polls :: Message Navigator

Merge Conflict - Synchronized PHP Project [message #1783520]

Tue, 13 March 2018 18:51

Steve _____

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.

Report message to a moderator

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

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Sep 21 06:15:26 GMT 2018

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter