Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
"Bo Berglund" <bo.berglund at removethis.system3r.se> wrote in message news:3f18f417.62843363 at news.cvsnt.org... >AFAIK the merge operation will for example take data from a branch and >'push' it into the *working copy* in my sandbox. "Tony Hoyle" <tmh at nodomain.org> wrote in message news:bfb4ni$3h4$1 at sisko.local.nodomain.org... > Multiple developers don't matter... the second one to commit will get a > conflict, as normal, if they're marging the same part of the tree. If I am getting this right, the mergepoint is stored in the working folder (sandbox) not in the repository. If this is the case: - one user merges 2 branches - assume that development continues on both branches - when a different user merges the branches a second time he will get the conflicts of the first merge too Or is the mergepoint committed to the repository too? By the way is there does not seem to be any (or sufficient) documentation about merge points. If anybody finds or writes something please post a link. Thanks, -- Kevin Agius