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

RE: How about a troubleshooting guide for tree conflicts?

From: Andrew Reedick <Andrew.Reedick_at_cbeyond.net>
Date: Fri, 30 Aug 2013 09:22:14 -0400

> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: Friday, August 30, 2013 9:09 AM
> To: Vesa Paatero
> Cc: users_at_subversion.apache.org
> Subject: Re: How about a troubleshooting guide for tree conflicts?

> The SVN Book has a short chapter about tree conflicts which I wrote:
> http://svnbook.red-bean.com/en/1.7/svn.tour.treeconflicts.html
> However, it falls short of covering complex issues people actually run into in real life.

How about we start with a list of the possible error messages? =)

IME, a merge conflict means you, the user, have to manually recreate the tree via svn copy, svn mv, etc. commands. Which is a *huge* perception/paradigm change from how file merges are handled. Meaning, tree conflicts have zero automation/help from svn. Once you accept that, and learn how to read the messages, tree conflicts aren't that mysterious anymore.
Received on 2013-08-30 15:28:28 CEST

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