Dans son message intitulé « Re: [e-users] Conflict in svn update »
du Fri, 28 Nov 2008 18:53:20 -0200, "Iván Briano (Sachiel)"
<sachieru@...> nous a donné l'occasion de lire :
> On Fri, Nov 28, 2008 at 6:45 PM, Max <gasparotto.m@...> wrote:
> > 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
> You can delete the conflicting files and update again, that way
> it wil only download those files and not the whole thing. Also,
> choosing h will show more options, one of which will keep the
> remote file and discard your changes, don't remember what
> the option was, but that's the one you want.
It is tf (Theirs-Full).