Ups, ignore this.
(the changes are saved on close + confirmation dialog, or, I guess ctrl-s)
I was fixated on "conflict resolution" and expected the "Mark as resolved"
button to work.
Sorry.
David
> -----Original Message-----
> From: David Balažic [mailto:david.balazic_at_hermes-softlab.com]
> Sent: Friday, March 13, 2009 3:56 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: Question about TortoiseMerge on modified files
>
> Hi!
>
> If the Check for Modifications windows shows for a file,
> that it is modified both localy and remote, then double clicking it
> brings up the TortoiseMerge windows.
>
> In that window, you can gor from conflict to conflict (F8, shift-F8)
> and then "use their" or "use mine" (ctrl-F9 and ctrl-F10).
> (the bottom view changes content accordingly.
>
> But what is the purpose of all this ?
> You can not save any choices made.
>
> To properly resolve conflicts, one must "Update" the file, and then
> do the above again. Except that now you can save the work.
>
> In short: why are the conflict resolution functions active, when
> the result is not used/saved ?
>
> This is on v1.5.9 win32
>
> Regards,
> David
>
>
> ---------------------------------------------------------------------
> http://www.nosoftwarepatents.com Innovation, not litigation !
> ---
> David Balažic mailto:david.balazic_at_hermes-softlab.com
> HERMES Softlab http://www.hermes-softlab.com
> Zagrebska cesta 104 Phone: +386 2 450 8937
> SI-2000 Maribor
> Slovenija
> ---------------------------------------------------------------------
> "Be excellent to each other." -
> Bill S. Preston, Esq. & "Ted" Theodore Logan
> ---------------------------------------------------------------------
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061
> &dsMessageId=1317551
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_tortoisesvn.tigris.org].
>
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1317562
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-13 16:01:37 CET