Massimiliano Calamelli ha scritto: > 2008/11/28 Max <[EMAIL PROTECTED]>: > >> What should I do (when running easy_e17) I encountered svn conflict? I >> can choose (p)ostpone, (d)iff, (e)dit, (h)elp ... but I did not >> understand how. >> For now I just delete everything e17_src. >> Any help is much appreciated thanks. >> Max >> >> > > If conflics are related to po/pot files, or if you're sure that you > haven't changed anything in sources, you can easily type tf (that > means theirs full, in other words you accept all modification that > came from repo) when svn ask you (p)ostpone, etc > > Ciao > > Massimiliano > > Yes conflicts are related to po files! Many thanks to all Max
------------------------------------------------------------------------- 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=/ _______________________________________________ enlightenment-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-users
