SVN Process: Simple conflict scenario
Person A changes a line of code in a file and commits it.
Person B changes the same line of code in the file and is unaware of Person A’s change.
When Person B goes to commit their change, SVN reports that he can’t commit the file is out of date and prompts him to update.
Person B must now click cancel and manually update the file (right click > Tortoise SVN > update). This manual update creates the conflict which consists of hidden files named .mine and .thiers.
Person B must now resolve the conflicts (right click > Tortoise SVN > edit conflicts). Person A’s file appears on the left split screen with person B’s file on the right. Code can be chosen from either file and then click the resolved button at the top. The hidden files are now removed as the conflict has been resolved.
Person B can now commit thier file with the new merged file being point of truth.