Re: Merges between PHP5 and PHP7
| From: | Derick Rethans | Date: | Thu, 28 Aug 2014 15:23:54 +0000 |
| Subject: | Re: Merges between PHP5 and PHP7 | ||
| References: | 1 2 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-76920@lists.php.net to get a copy of this message | ||
On Fri, 22 Aug 2014, Derick Rethans 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.
Really, no comments about this at all?
cheers,
Derick