Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:45006 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 53308 invoked from network); 16 Jul 2009 23:25:29 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jul 2009 23:25:29 -0000 X-Host-Fingerprint: 87.118.104.77 ns.experimentalworks.net Date: Thu, 16 Jul 2009 19:25:29 -0400 Received: from [87.118.104.77] ([87.118.104.77:24807] helo=localhost.localdomain) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 8B/69-09639-8E6BF5A4 for ; Thu, 16 Jul 2009 19:25:29 -0400 To: internals@lists.php.net References: <4A5FA493.9040204@lerdorf.com> <4A5FA8B2.1080102@sci.fi> <4A5FAD73.1060109@tekrat.com> Message-ID: User-Agent: slrn/0.9.8.1pl1 (Debian) X-Posted-By: 87.118.104.77 Subject: Re: [PHP-DEV] svn checkout suggestion From: sn_@gmx.net (David Soria Parra) On 2009-07-16, Pierre Joye wrote: > I doubt any tools can really help to automatically help to merge > changes from one branch to another (in php). However there are many > very good merging tools (with UI) out there to ease this process > (meld, winmerge, etc.). In that case it's more that if we use merge tracking svn will recognize what was already merged and try to find a common ancestor of the files that will be merged, which usually results in less merge conflicts than in CVS. Merge tracking just helps to minimize conflicts, but for sure, from time to time we have to resolve conflicts ourselfs.