"Problem resolution" svn up encounters conflict discovered in ' * * * * * * * * * * __SVN

SVN up encounter conflict discovered in ' **/****.php ' on the server's SVN library today. The problem, at first thought was SVN locked, using SVN cleanup to do svn Up still has the same problem. Google on the internet found that the original is because subversion found the local work copy and repository inconsistencies, the need for the SVN user to determine their own, need to enter the TF directly. The following figure.

If you don't remember the meaning of each option, you can enter S to understand. In addition, if you are unsure if you have changed your local project file, you can enter a DC to understand the differences between the local code and the repository. Detailed introduction can be referred to: http:// www.logicaltrinkets.com/wordpress/?p=178, the writing is very clear, English.