Tag Archives: Resolve

SVN resolve conflict

When using SVN, it is often the case that someone else commits and conflicts with the files I work on. Let’s take a look at how easy it can be solved here. When a collision occurs, Files with conflicting mine and revision numbers are created. First, check the “Edit conflicts” menu to see how it

Read More