ASP.NET - when i am trying to build my web application facing an error like "<<<<<.mine"

Asked By brahma naidu on 06-Dec-12 06:33 AM
 when i am trying to build my application in svn i am facing an error "<<<<<<.mine" please help me.
avula replied to brahma naidu on 07-Dec-12 12:59 AM
I think you are new to SVN ?

This is happens due to changes done in same file by many developers who are using svn.  .mine means you done changes it is your changes, another one is .their changes , means they done changes.

now you can either remove your .mine changes or remove .their changes ..

best luck.