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

Re: Rename tracking for merges

From: Stefan Sperling <stsp_at_elego.de>
Date: Sat, 5 May 2012 12:04:02 +0200

On Sat, May 05, 2012 at 11:57:07AM +0200, Stefan Sperling wrote:
> I would prefer
> if those trying to fix merge would think more about tree conflict resolution
> than anything else.

Oh, and BTW, those who are new to the project and would like to learn
more about the subject of tree conflicts, my BSc thesis might be
worth reading: https://www.inf.fu-berlin.de/w/SE/ThesisTreeConflicts

Note that some of what I wrote back then wasn't entirely correct, and
some aspects of the problem space lack coverage, so this is definitely
not an "expert" reference for the subject. But it should be a good
starting point for those who have never dealt with the topic before.
Received on 2012-05-05 12:04:37 CEST

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