Cocamaxgui conflicted?

BlitzMax Forums/BlitzMax GUI Programming/Cocamaxgui conflicted?

I updated my MaxGUI and received :

Conflicted C:\BlitzMax\mod\maxgui.mod\cocoamaxgui.mod\cocoamaxgui..bmx
Completed at revision : 33
Warning! One of more files are in a conflicted status.

What do I need to do about it?

<edit> Hmmm, just tried building modules which failed as CocoaMaxgui.bmx contains :

<<<<<<< .mine
ModuleInfo "History: Swapped tabber icon drawing code (so that it works)."
=======
ModuleInfo "History: Improved handling of text-areas in NSState to avoid crash."
ModuleInfo "History: Swapped tabber icon drawing code (so that it works)."
>>>>>>> .r33

Commenting these out builds OK.

SebHoll

Conflicting just means that changes have been made both to the local copy on your PC and the latest files on SVN. Deleting the files concerned before checking out again should fix the issue.

tonyg

So I need to delete some files before doing an SVN Update? Is that right? I don't understand really as that's not exactly an update and could it not cause problems if I delete the file and then, for whatever reason, can't download the new one?
Maybe I have missed how to use SVN but what is the right way to download upgrades?

<edit> Just checked the MaxGUI SVN Advice thread.
Does it mean I delete the whole MaxGUI mod folder contents and re-download? How does that work for the rest of Bmax? Should I delete the contents of BRL and PUB and do the same? The Advice thread suggested I had made a change to the MaxGUI mod but I am sure I did not. What other reasons could cause the conflict?