Re: [PHP-DEV] Merges between PHP5 and PHP7

On Aug 22, 2014 1:39 PM, "Derick Rethans" <[email protected]> wrote:
>
> On Fri, 22 Aug 2014, Anatol Belski wrote:
>
> > as there are many data type changes, here's an idea on how to simplify
> > the merges. Git supports custom merge drivers which attracted my
> > attention, so I've ended up with the following trick:
>
> As there are that many differences, does it still make sense to GIT
> merge PHP 5 changes up to 7 at all? Shouldn't we just do it by hand. I
> would expect that to have a much greater rate of success.

I brought this topic a while back too. The same issue happens for pecl
extensions. The more exts I do the more I think about either using separate
branches or separate source files, respectively separate realeses or common
release for both 5.x and 7.x.

For the core, I have the feeling than manual merges will be far less
painful.

Cheers,
Pierre