I am trying to get the latest code from svn. When I do so, for one file, it shows a conflict.
I haven't changed this file, so I don't know why it show a conflict. Is there any other reason for conflict as well.
Secondly, how do I force it to update this file from svn. I know that the other developer has made some changes, so I need it in my codebase.
Perforce has a 'Force update' option, but couldn't find it in svn.