[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Resolving property conflicts

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 21 Jan 2015 16:20:58 -0600

On Thu, Jan 15, 2015 at 1:25 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 14.01.2015 23:20, Ben Fritz wrote:
> > When I'm using TortoiseSVN, I see a dialog with the conflict-markers and
> > some other text. There are choices to take the entire "theirs" or
> > "local" property, or to manually edit the property. Manually editing
> > brings up the properties dialog; I need to select the conflicting
> > property myself. When I do that, I just get the "local" version, with no
> > conflict markers.
> >
> Can you try a nightly build from trunk?
> I think I implemented better property conflict resolving there, but it's
> been a while and I'm not entirely sure :)

Latest nightly gives a "edit conflict" button which invokes my external
merge utility.

After merging, I can "mark as resolved".

Perfect solution, thanks!

I've uninstalled the nightly for now (out of paranoia) so I'll eagerly
await the official release containing this feature.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-21 23:21:29 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.