Show whole topic Sep 03, 2008 5:32 am
beko Offline
Developer, Administrator
Registered since: Jun 04, 2004
Location: Cresbach


Subject: Re: Patches
probably a conflict with your local version. you worked on your local file and svn detects that. now it gets a newer version from svn so it ends up showing you a conflict. you can

a.) undo local changes to get a fresh file from svn
b.) merge svn version with your version and get a new file that you should send to us again
Bernd Kosmahl
"Sir, we are surrounded!" - "Great - we can attack in any direction."