Re: Mark as resolved during interactive merge.

David Henderson wrote:
> If you are doing an interactive merge:
> - come across a conflicted file
> - click "Edit Conflict"
> - Edit the conflict
> - Click the "mark as resolved" button within tortoise merge.

"mark as resolved" simply can't work in that situation: there is no
local conflict to be marked as resolved! Just "save" your edits and quit
TortoiseMerge.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1349444
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].