Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[gmt-dev] .project non-conflict


We seem to have a stupidity with org.eclipse.gmt/.project.

Either I or Ghica in our naive first usage of Eclipse CVS did
something wrong, as a result I think we each independently created
default .project files. I found last night that mine was apparently
in conflict in spite of having no differences. After some
struggling with fairly random updates to try to overide my file from
CVS, I think I did the reverse, so potentially Ghica now needs to
update to resolve the 'conflict'. I hope that she can be more intelligent
than me, perhaps by deleting it and then restoring, but will this lose
the project connection? 

Anyway, my apologies to Ghica for creating this problem for her. I
suggest that others make sure that they fetch rather than create the
.project on first attachment.

		Ed Willink

E.D.Willink,                             Email: mailto:EdWillink@xxxxxxx
Thales Research and Technology (UK) Ltd, Tel:  +44 118 923 8278 (direct)
Worton Drive,                            or  +44 118 986 8601 (ext 8278)
Worton Grange Business Park,             Fax:  +44 118 923 8399
Reading,   RG2 0SB

Back to the top