[Gambas-user] Need help understanding svn

[Laurent Carlier]

Le mardi 30 septembre 2008 23:38:02 richard terry, vous avez écrit :
> I wondered how to interpret this as my svn won't update.
>
> svn: Aborting commit: '/home/richard/coding/gambas2/trunk/.settings'
> remains in conflict
>
> Regards
>
> Richard
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's
> challenge Build the coolest Linux based applications with Moblin SDK & win
> great prizes Grand prize is a trip for two to an Open Source event anywhere
> in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> Gambas-user mailing list
> Gambas-user at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gambas-user

I guess because the file .setting in your directory and the .setting file in the 
svn got difference that can't be automaticly merge.

Regards,