Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96330
Return-Path: <cmbecker69@gmx.de>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 77654 invoked from network); 12 Oct 2016 14:41:21 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 12 Oct 2016 14:41:21 -0000
Authentication-Results: pb1.pair.com header.from=cmbecker69@gmx.de; sender-id=pass
Authentication-Results: pb1.pair.com smtp.mail=cmbecker69@gmx.de; spf=pass; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmx.de designates 212.227.17.21 as permitted sender)
X-PHP-List-Original-Sender: cmbecker69@gmx.de
X-Host-Fingerprint: 212.227.17.21 mout.gmx.net  
Received: from [212.227.17.21] ([212.227.17.21:57064] helo=mout.gmx.net)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id FF/44-41968-19B4EF75 for <internals@lists.php.net>; Wed, 12 Oct 2016 10:41:21 -0400
Received: from [192.168.2.103] ([79.243.112.45]) by mail.gmx.com (mrgmx103)
 with ESMTPSA (Nemesis) id 0Ld0E0-1bCVWW3BMu-00iFLM; Wed, 12 Oct 2016 16:41:16
 +0200
To: Anatol Belski <anatol.php@belski.net>,
 'PHP Internals' <internals@lists.php.net>
References: <0e0887f9-f4dc-862b-0427-33c2e8b4d739@gmx.de>
 <006f01d22495$a7463950$f5d2abf0$@belski.net>
Message-ID: <04faecb2-4f39-06ae-3d7b-e96eaa37f9d6@gmx.de>
Date: Wed, 12 Oct 2016 16:41:48 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.4.0
MIME-Version: 1.0
In-Reply-To: <006f01d22495$a7463950$f5d2abf0$@belski.net>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-Provags-ID: V03:K0:MSnTfDI9oJiAVyCVU7Stiq7O8swHk8jU8RV4oyzfNWBMgp5/1wG
 fno+/cBodjbLoSRmEzeurRUMNVVUjQoZLgdQGPCRQAcHCWESd71liqIU67rNxVzBzpFgqAv
 TCVpxW1tdg4uFVZNkg0eyO9+wA5hzQD+vFS0+h/ITMrqSGYfj2ueieuR7P5J80zNY0uJRup
 jrBIPbkwrjW71ZxQhAiLw==
X-UI-Out-Filterresults: notjunk:1;V01:K0:RxSVXPSHzcY=:c9BbeVWWEySvFbmfidmLzj
 FQYRqlzyXnMzeeMQ0TZDrXPqE1LWPFpR/6oobGA1Uh053lChMHD6e8p52w5wRz6nhSwsy+N3I
 JLUHg88HxYmboPPptyVRff2zxWE7WyFmkn5KeE7Ggs3zUbuSyRFXeby5d3jDivN5eYXQFRWmp
 RiMkymymuyaCVFsfaBaZz7QSggbZHnaQJggJ3q7U59sQSHTbkwMotOpQ7eK7g9yVMl/jU5Uc2
 J8PCs8jUgUN5x3D5s8Z2m7OETC9rgMmSi7qTU0mT7eiH0VYJv18AWD5F9SHiqHhKIEKStSk2V
 MWp1hRlqGdY0QA8qFbrtNHcDSQeHvxr0N0dtWGDrOTTopyVZ18Ie02xftEI4S3FnGWXqT6NfG
 l3+Pa7QFH4AC2N8GXTg9RsFnPx2wfjN8ufSe/9kmlnbPodKZMwtESkwOwqECvsSXBSNNJlKco
 hpthgd0dxVBzdPwGMlxLOaGBMiMEvBfaHDEkB7BacV22TlkyoJrOPCeCfrS0t8aa4ORBedu2T
 QZ4GUjbP5kvXPTxo5Kza6fskjEj9iV+MoUS97zGR/4EWAD2wezp/h0Dsurzx/cCiANeeScwXI
 fDHLYuMwLXTQ4x2vcyS6fLCAP+btf4ARL7p1QRgwVLgQBs8IFxhiI38E/3Z5zWdmIeDYo9PJg
 /aqFrlCYHgNAJOMJYpmPyF9AL8LDabd3ahUNQBHFvr1yz50XjxsX8HXChv0Gb1tVVdXfAgXXu
 O9+qlEMbYlq6KQBLcyK5xwYUgsEbk4YwMiDE5VFk6Re22XWLkY5k1sUCS8+8FeN2MUemc5SrF
 TsjMZKB
Subject: Re: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
From: cmbecker69@gmx.de ("Christoph M. Becker")

Hi Anatol!

On 12.10.2016 at 16:33, Anatol Belski wrote:

>> -----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
>>
>> Hi!
>>
>> 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.
>>
>> Can somebody please have a look at this issue.
>>
> 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! (also for the quick reply)

-- 
Christoph M. Becker