Resolving conflicts in Subversion (SVN)

Written on July 6, 2010 – 7:09 pm | by Stan Kuhn |

As I have seen many people not being able to sort out conflict state of their local copy of the project I decided to write a little about it. First of all why do these conflicts happen. Subversion unlike for example SourceSafe from Microsoft by default does not require locking of files in repository when [...]