Subclipse adding crap into my code on Eclipse

Question

My code is breaking because every time I try to recover from a previous revision of my code Subclipse keeps adding this weird notation/conments into my Javascript.

e.g.

    if (profanityCheck() == false)
<<<<<<< .working
    {
        var inputData = "";
        var newData = new Array();
=======

How do I stop it doing this?

Thanks

Answer 1

That generally indicates there's a conflict between the version of the file in your workspace and the version from the SVN you're trying to switch to.

To fix it Right-click -> Team -> Mark resolved, then select the option that makes the most sense (probably use the incoming version of the file).