[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [ptp-user] How to recover from crashed that affect synchronized projects ?
|
Hi
Try deleting the problem files in your local workspace. The merge conflict
may be happening on the local side.
John
On Thu, Dec 8, 2011 at 1:47 PM, Christoph Pospiech
<Christoph.Pospiech@xxxxxxxxxx> wrote:
Today during a demo, my eclipse completely crashed (eclipse disgracefully
exited and closed all windows). After restarting any attempt to synchronize
the projects failed with a message that there is a merge conflict for some file
blahblah.o. This is a typical git error message. The file blahblah.o was not
important and can be recreated by something like "make clean;make".
How to recover from this ?
I tried the following to no avail.
- project clean for the remote project fails because the synchronization prior
to make clean failed.
- Login on remote node outside of eclipse and make clean didn't help.
- Removing remote .ptp-sync leads to error message that directory .ptp-sync is
missing
- Removing .ptp-sync on both got me another error message.
Any hints ?
--
Mit freundlichen Grüßen / Kind regards
Dr. Christoph Pospiech
High Performance & Parallel Computing
Phone: +49-351 86269826
Mobile: +49-171-765 5871
E-Mail: christoph.pospiech@xxxxxxxxxx
-------------------------------------------------------------------------------------------------------------------------------------------
IBM Deutschland GmbH / Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Martina Koederitz (Vorsitzende), Reinhard Reschke, Dieter
Scholz, Gregor Pillen, Joachim Heel, Christian Noll
Sitz der Gesellschaft: Ehningen / Registergericht: Amtsgericht Stuttgart, HRB
14562 / WEEE-Reg.-Nr. DE 99369940
_______________________________________________
ptp-user mailing list
ptp-user@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ptp-user
