Subversion only sees that the changes were made independently on precisely the same item. It knows nothing of the content or impact of that change within your code and, rightly so, will identify this situation as a conflict.
Since your using Tortoise, this is easy enough to deal with in the situation you describe. Right-click, edit conflicts, use whichever block of text you please, mark as resolved, test the code, commit the merge, and be on your merry way. -Tim -----Original Message----- From: Brian Neal [mailto:bgn...@gmail.com] Suppose I have a file on trunk called file.txt. I put a property on it, say color with the value red. Now I copy trunk to a branch B. On branch B I change file.txt's color property to green. Now independently on trunk, I also change file.txt's color property to green. When I merge the branch B back to trunk, I get a merge conflict, even though both the branch and the trunk are trying to change the property to the same value. Is this expected or a bug or ...?
