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

[email protected] (Derick Rethans)
Newsgroups php.internals
Message-ID <[email protected]> 
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.

cheers,
Derick
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.