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

Re: Tree conflict resolution considered harmful

From: Dag-Erling Smørgrav <des_at_des.no>
Date: Wed, 29 Aug 2018 13:49:31 +0200

Daniel Shahaf <danielsh_at_apache.org> writes:
> Dag-Erling Smørgrav <des_at_des.no> writes:
> > Please add an option to disable conflict resolution entirely.
> As a hotfix, I think this will do what you need?

Thanks, I will test this later.

DES 

-- 
Dag-Erling Smørgrav - des_at_des.no
Received on 2018-08-29 13:49:51 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.