Re: [e-users] Conflict in svn update

2008-11-29 Thread Max
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

Re: [e-users] Conflict in svn update

2008-11-28 Thread Chidambar 'ilLogict' Zinnoury
Hello! Dans son message intitulé « Re: [e-users] Conflict in svn update » du Fri, 28 Nov 2008 18:53:20 -0200, "Iván Briano (Sachiel)" <[EMAIL PROTECTED]> nous a donné l'occasion de lire : > On Fri, Nov 28, 2008 at 6:45 PM, Max <[EMAIL PROTECTED]> wrote: >

Re: [e-users] Conflict in svn update

2008-11-28 Thread Iván Briano (Sachiel)
On Fri, Nov 28, 2008 at 6:45 PM, Max <[EMAIL PROTECTED]> 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 tha

Re: [e-users] Conflict in svn update

2008-11-28 Thread Dan Kronstal
if it's an update that failed (./easy_e17.sh -u) then try adding the -f flag. if it's a fresh install on a clean system then I suppose just wait until the source gets sorted :) On Fri, Nov 28, 2008 at 1:45 PM, Max <[EMAIL PROTECTED]> wrote: > What should I do (when running easy_e17) I encounter

[e-users] Conflict in svn update

2008-11-28 Thread Max
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 -