Question about TortoiseMerge on modified files
From: David Balažic <david.balazic_at_hermes-softlab.com>
Date: Fri, 13 Mar 2009 15:55:55 +0100
Hi!
If the Check for Modifications windows shows for a file,
In that window, you can gor from conflict to conflict (F8, shift-F8)
But what is the purpose of all this ?
To properly resolve conflicts, one must "Update" the file, and then
In short: why are the conflict resolution functions active, when
This is on v1.5.9 win32
Regards,
---------------------------------------------------------------------
--- 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].Received on 2009-03-13 15:58:21 CET |
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.