[e-users] Conflict in svn update

[Max <gas...@al...>]

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