[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [ptp-user] What am I to do with the Synchronized Merge View
- From: Brian Watt <bwatt@xxxxxxxxxx>
- Date: Tue, 7 Aug 2012 11:59:07 -0500
- Delivered-to: email@example.com
Nevermind, I used "I get a merge conflict for a file that changed both locally and remotely. How do I recover from this?" on URL http://wiki.eclipse.org/PTP/sync-projects, and deleted the two .ptp-sync directories to get back alive again.
Brian Watt, IBM
Brian Watt---08/07/2012 09:34:00 AM---So I'm setting up a synchronized project containing about 3800 files. My local client is Linux and m
From: Brian Watt/Austin/IBM
To: "PTP User list" <ptp-user@xxxxxxxxxxx>,
Date: 08/07/2012 09:34 AM
Subject: What am I to do with the Synchronized Merge View
So I'm setting up a synchronized project containing about 3800 files. My local client is Linux and my remote host is Linux. I'm running the latest Eclipse PTP code from the nightly build.
Initially I tried synching, but realized that I should have filtered out some of the root directories. So I added them to the filter after the fact. Next I deleted the local filtered replicated directories from my workspace manually using the command line, because I didn't want to use Eclipse just in case Eclipse would delete the remote directories. Now I'm getting Synchronization Error popup stating "Synchronization error for project: <project_name> Merge Conflict" and two buttons Open Merge Conflict View and OK. I selected Open Merge Conflict View and get a view with a number of files listed. Selecting on of the files I get a menu list with things like "Reset to version before merge", "Mark as resolved", and "Resolve as remote". Yet when I select any of these nothing seems to change in the view. Are these menu items documented somewhere? I now can't get synchronization to work without this error. I have tried to start and stop Eclipse, but that doesn't help. I'm frustrated and stuck.
Also the Synchronized Merge View does not allow me to select multiple entries yet I have 76 individual files listed.
Brian Watt, IBM