SVN update problem

[iw2nhl]

In the wiki that describes how to compile from svn, you read that the code should be updated using

Code Select Expand

svn update
I tried it, but I have a problem:
i modified a source file in my hd version
finddlg.cpp
After an update I find:
finddlg.cpp
finddlg.cpp.mine
finddlg.cpp.r2779
finddlg.cpp.r2790

When I compile the updated source from svn I get errors because the new finddlg.cpp file contains:

Code Select Expand


<<<<<<< .mine
// my modified code here
=======
// new code here
>>>>>>> .r2790


How to avoid this?
Why the resulting code is messed up that way? svn already provided the old and new versions and backed-up my version too. Why merge all together in the code that should be compiled?

[thomas]

http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.tour.cycle.resolve

[iw2nhl]

Thanks!