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: Christian Balzer <christian.balzer.ba_at_gmail.com>
Date: Wed, 9 Apr 2014 13:38:02 +0100
I have trouble understanding what TortoiseSVN's context menu items in
--- I sometimes get conflicts when updating my working copy in TortoiseSVN, as I'm sure many of you do, and I just got rather confused with the options available in Tortoise's context menu. (I must have double-clicked so far...) Can someone please explain what the first three menu options are good for? (Screenshot available at http://i.stack.imgur.com/jZIyg.png) Here is what I think they do: "Compare with working copy" I thought this would compare what i have locally with what is currently in the HEAD revision on the server. But now I'm not sure anymore. Is it comparing what I currently have in my WC versus what the code looked like when I checked it out (i.e. WC vs. an old revision)? "Edit conflicts": HEAD vs. WC? "Mark as resolved": Not sure when I would use this? Unfortunately, the docs don't seem to mention the context menu:http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-update.html Also, TortoiseSVN created two files in the directory: filename.ext.r8471 and filename.ext.r8476. Menu entry 2 identifies r8476 as "Theirs", menu item 1 uses r8295. Where does revision 8471 come from? it doesn't show up in the file's log. And how do I find out what the current HEAD's revision number is? Last but not least, my changes were exactly the same as theirs, so any idea why this caused a conflict? Yet another question: if you choose "Edit conflicts" and then, inside the merge tool immediately mark the conflict as resolved, what changes will prevail? ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3076192 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2014-04-09 14:47:04 CEST
This is an archived mail posted to the TortoiseSVN Users mailing list.