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

Newby question regarding merging

From: Mads Pultz <mpz_at_vp.dk>
Date: 2007-04-20 11:42:48 CEST

Hi,

I was wondering how subversion performs a merge. Is it performed by the
server or is it up to the subversion client? I mean, who performs the
logic that compares the two files and determines whether or not there is a
conflict? How is this different than how it is done by CVS?

Regards
Mads
Received on Fri Apr 20 11:43:07 2007

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.