On Friday, September 7, 2018 at 2:06:00 PM UTC+2, Tobias Knauss wrote: > > Related Feature request: > (this maybe should be a separate post, but I add it here as it is closely > related) > > Add an option in the dialog to manually select the file in which the merge > should be executed, if this file could not be found due to tree conflicts: > > None of these 2 options is satisfying, as the changes that are to be > merged are lost. > Please add [Manually select target file for merge] > > unfortunately, there's no svn API that accepts a target path for resolving such a tree conflict. So I don't think I can add such a button.
Stefan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/85e82542-1890-4b80-be2c-d51eb4ec758a%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
