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 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. > > ------------------------------------------------------------------------- > 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 > ------------------------------------------------------------------------- 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
