Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96329
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain belski.net from 85.214.73.107 cause and error)
To: "'Christoph M. Becker'" <cmbecker69@gmx.de>,
	"'PHP Internals'" <internals@lists.php.net>
References: <0e0887f9-f4dc-862b-0427-33c2e8b4d739@gmx.de>
In-Reply-To: <0e0887f9-f4dc-862b-0427-33c2e8b4d739@gmx.de>
Date: Wed, 12 Oct 2016 16:33:48 +0200
Message-ID: <006f01d22495$a7463950$f5d2abf0$@belski.net>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Thread-Index: AQLFdCr5dNBM21G14lJRa+GpGCFwxJ6+QbQg
Content-Language: en-us
Subject: RE: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
From: anatol.php@belski.net ("Anatol Belski")

Hi Christoph,

> -----Original Message-----
> From: Christoph M. Becker [mailto:cmbecker69@gmx.de]
> Sent: Wednesday, October 12, 2016 4:26 PM
> To: PHP Internals <internals@lists.php.net>
> Subject: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
>=20
> Hi!
>=20
> It seems there has been an unresolved bad merge.  When I attempt an =
empty
> merge from PHP-5.6 into PHP-7.0, Git reports 18 conflicting files.
>=20
> Can somebody please have a look at this issue.
>=20
Yeah, there are some patches not merged yet. I'm doing the porting work =
ATM, it should be resolved later today or tomorrow as latest.

Thanks

Anatol