Tortoise SVN why does it ask me to choose one if they are both the same?

Question

I am new to Tortoise SVN

(I am actually new to version control in general but trying to fix that!)

I am playing around trying to get used to it.

I have a conflict between 2 files:

Mine

A

C

Theirs

A
B

Obviously line 2 and line 3 are different on each so they need to be resolved. But line 1 is the same on both, so why is it asking me which to use?

alt text

I don't really follow the question? The file has conflicts so they need to be resolved and you understand that. So what is the problem?
@th3dude I am just trying to understand why it is asking me which to use for line 1. If I use mine or if I use theirs, either way it is "A". Maybe that is just the way TSVN is, but I thought maybe I was missing something.

paradroid · Answer 1 · 2010-12-30 00:01:19Z

up vote 0 down vote accepted

answered Dec 30 '10 at 0:01

paradroid
11.5k11342

feedback

1 Answer