Massimiliano Calamelli ha scritto:
> 2008/11/28 Max <gasparotto.m@...>:
>> 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.
> 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
Yes conflicts are related to po files!
Many thanks to all