Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

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

share|improve this question
    
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 Dec 15 '10 at 20:42
    
@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. –  JD Isaacks Dec 15 '10 at 21:03

1 Answer 1

up vote 0 down vote accepted

It's because you were not running a Subversion server.

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.