Hi Sjoerd,
For a first look at the basic principles the Subversion Book, which you
can find under http://svnbook.red-bean.com is worth a look.
And for the rest you should continue searching. It's *your* master
thesis so if you need to find out something don't stop searching too
soon. ;-)
Yours,
Stefan
> -----Original Message-----
> From: Sjoerd Tieleman [mailto:sjoerd.tieleman@phil.uu.nl]
> Sent: Monday, November 07, 2005 2:10 PM
> To: users@subversion.tigris.org
> Subject: Automatic conflict resolution
>
> Hi all,
>
> I'm currently in the process of preparing to write my master's
> thesis, which will probably deal with version management, data
> synchronization, merging of data structures (for example tree-based
> merging or graph-based merging, as opposed to line-based
> merging) and
> it will probably also contain some areas regarding Subversion.
> My question is: is there information available (other than
> the source
> code) which lists the various 3-way merge cases which Subversion can
> perform automatically? Ofcourse, the most interesting ones will be
> the conflicting ones, so what I'm basically looking for is
> information on automatic conflict resolution in Subversion. I can't
> seem to find very much about it on the Internet (other than the fact
> that at 1.0 Subversion didn't even have automatic conflict
> resolution).
>
> Thanks in advance,
>
> Sjoerd Tieleman.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 23 09:41:25 2005