Re: svn checkout suggestion
| From: | David Soria Parra | Date: | Thu, 16 Jul 2009 23:25:29 +0000 |
| Subject: | Re: svn checkout suggestion | ||
| References: | 1 2 3 4 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-45006@lists.php.net to get a copy of this message | ||
On 2009-07-16, Pierre Joye <pierre.php@gmail.com> 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.