Re: Re: Merging O+ into 5.5
| From: | Damien Tournoud | Date: | Fri, 15 Mar 2013 10:19:40 +0000 |
| Subject: | Re: Re: Merging O+ into 5.5 | ||
| References: | 1 2 3 4 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-66641@lists.php.net to get a copy of this message | ||
On Fri, Mar 15, 2013 at 11:08 AM, Dmitry Stogov <dmitry@zend.com> wrote:
> This solution clones the history, but makes merging between PHP and O+ repo
> (it's going to be used for pecl build for old PHP versions) even more
> difficult.
>
> Thanks. Dmitry.
Not sure. Merging between the two repositories using the subtree
strategy should be just fine.
… and having the history (ie. the common ancestors) should even help the merge
algorithm.
Damien