[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Questions re Conflict While Updating WC context menu items; revision files created while solving a conflict; and why a conflict happens in the first place

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 10 Apr 2014 14:10:16 +0000

> I have trouble understanding what TortoiseSVN's context menu items in the
> Conflict While Updating context menu are good for.
> I also don't quite understand why TortoiseSVN created a particular revision
> file on my disk in the process, and why the issue was raised in the first place. I
> initially posted my question on StackOverflow.com
> (http://stackoverflow.com/questions/22962337/conflict-while-updating-
> local-repository-using-tortoisesvn-what-do-the-context
> ); I'll paste/post it here for reference. It would be great if somebody could
> help me with this... :)
>
> Kind regards,
>
> Christian

A conflict means that you changed something on the same line as someone else did. When you update svn can't merge this because it doesn't know how. So, you have to resolve the conflict. The TSVN docs explain this fairly well.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3076283

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-04-10 16:10:24 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.