Svn questions

Hi all.
If I modify original sourcecode downloaded with svn checkout, and then do a svn update afterwards, does svn overwrite my own changes?
Greets Louis


It will not over-ride your changes. At worse, if the svn trunk contains modification in the exact same location in the same file as your local modification it will keep both your copy and the new code (and surround then with >>> then === then <<<) so that you can decide what to do to resolved the conflict.