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:
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?