Edit Property Conflicts dialog and TortoiseMerge

[sbrueg...@gmx.net]

Hi,

would it be possible to close the Edit Property Conflicts dialog and do what "Accept Merged" does when hitting "Mark as resolved" in a TortoiseMerge launched via "Edit" in the Edit Property Conflicts dialog?

That would be a lot more intuitive than choosing "save" in TortoiseMerge, close it and select "Accept Merged", especially since the Edit Property Conflicts dialog is a little bit confusing. Even the documentation suggests to use "Mark as resolved" after "Edit", although that discards(!) the incoming changes.

I'd suggest renaming "Accept Merged" to "Mark as resolved" and to clarify the other options. I wouldn't remove the option currently named "Accept Merged" in favour of TMerge's "Mark as resolved" since it is needed when using a third party merge tool.

By the way: Except for "Edit" all the other options in the Edit Property Conflicts dialog are missing a translation in the German language pack.

Kind regards

[Stefan]

On Tuesday, July 31, 2018 at 11:02:02 AM UTC+2, (unknown) wrote:

Hi,

would it be possible to close the Edit Property Conflicts dialog and do what "Accept Merged" does when hitting "Mark as resolved" in a TortoiseMerge launched via "Edit" in the Edit Property Conflicts dialog?

would be possible. But what about those who don't have TMerge configured to resolve conflicts?

 

By the way: Except for "Edit" all the other options in the Edit Property Conflicts dialog are missing a translation in the German language pack.

those strings are not provided by TSVN but by the svn library. And the translations there are way behind...

Stefan

[sbrueg...@gmx.net]

>> would it be possible to close the Edit Property Conflicts
>> dialog and do what "Accept Merged" does when hitting
>> "Mark as resolved" in a TortoiseMerge launched via "Edit"
>> in the Edit Property Conflicts dialog?

> would be possible. But what about those who don't have
> TMerge configured to resolve conflicts?

They keep using "Accept Merged" in the Edit Property Conflicts dialog.

I tried to suggest to make the "Mark as resolved" button in TMerge operational in this case: It should mark the conflict as resolved and close the Edit Property Conflicts dialog afterwards.

I'm using KDiff3 myself and found this inconsistency while trying to resolve a conflict with TMerge instead because the misleading label texts from the svn library kept me losing changes.