First of all.... thanks for the quick answer and sorry for the double post.
User wrote:
>> When using an external merge tool like kdiff3, it will be really useful
>> if the "Resolved" option is available in the "Update dialog" when a file
>> has conflicted.
Stefan wrote:
>You could ask the devs of kdiff3 to implement the resolving: just
>deleting the three files you diff is enough.
I don't think this has anything to do with kdiff3. I just use kdiff3 to solve
the conflict and save the conflicted file using the same name. kdiff3 cleans
up nicely.
I just need to tell my working copy's .svn folder that I resolved the conflict.
The sooner the better, so I don't forget which conflicts I have
already resolved.
User wrote:
>> The "Resolved" option is available in the "Check for modification"
>> dialog or by right clicking directly on the conflicted file in Windows
>> Explorer.
>> I checked if this option were available in the newest
>> TortoiseSVN-1.3-RC1, but it does not seem to be available yet.
Stefan wrote:
>Try again. It's available. Of course, only if you have a conflicted file.
I tried again... right clicking on a conflicted red line in the update dialog
shows the pop-up menu (both before and after resolving the conflict
using kdiff3):
[Compare with working copy]
[Edit conflicts]
[Resolve conflict using "theirs"]
[Resolve conflict using "mine"]
[Show Log]
I am just suggesting that a [Resolved] option is available in this pop-up menu.
The most logical would be if the [Resolved] option was first available when the
user has clicked [Edit conflicts] or doubleclicked on the conflicted file (which
is the same).
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jan 5 10:17:28 2006