Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:87206 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 49754 invoked from network); 16 Jul 2015 17:16:32 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jul 2015 17:16:32 -0000 Authentication-Results: pb1.pair.com header.from=bobwei9@hotmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=bobwei9@hotmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain hotmail.com designates 65.55.111.96 as permitted sender) X-PHP-List-Original-Sender: bobwei9@hotmail.com X-Host-Fingerprint: 65.55.111.96 blu004-omc2s21.hotmail.com Received: from [65.55.111.96] ([65.55.111.96:52310] helo=BLU004-OMC2S21.hotmail.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 60/D3-16799-9E6E7A55 for ; Thu, 16 Jul 2015 13:16:25 -0400 Received: from BLU436-SMTP107 ([65.55.111.73]) by BLU004-OMC2S21.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.23008); Thu, 16 Jul 2015 10:16:21 -0700 X-TMN: [HWBA4fQsNuEWBtQ4f5NrneJARFjPCfKF] X-Originating-Email: [bobwei9@hotmail.com] Message-ID: Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 (Mac OS X Mail 8.2 \(2098\)) In-Reply-To: Date: Thu, 16 Jul 2015 19:15:34 +0200 CC: PHP Developers Mailing List Content-Transfer-Encoding: quoted-printable References: To: marius adrian popa X-Mailer: Apple Mail (2.2098) X-OriginalArrivalTime: 16 Jul 2015 17:15:58.0356 (UTC) FILETIME=[14F4ED40:01D0BFEB] Subject: Re: [PHP-DEV] merging into master question From: bobwei9@hotmail.com (Bob Weinand) Hey, I had done changes which needed incompatible fixes in 5.6 than in 7.0 = and not merged yet. Just pushed a git merge --strategy=3Dours; you may want to retry now. Bob > Am 16.07.2015 um 18:41 schrieb marius adrian popa : >=20 > I have patched pdo_firebird driver in my local branch using this patch > https://bugs.php.net/bug.php?id=3D61183 >=20 > I have an issue when merging with master >=20 >=20 > git merge --no-ff --log PHP-5.6 > Auto-merging ext/pdo_firebird/firebird_statement.c > CONFLICT (content): Merge conflict in = ext/pdo_firebird/firebird_statement.c > Auto-merging Zend/zend_vm_execute.h > CONFLICT (content): Merge conflict in Zend/zend_vm_execute.h > Auto-merging Zend/zend_vm_def.h > CONFLICT (content): Merge conflict in Zend/zend_vm_def.h > Auto-merging Zend/tests/bug69732.phpt > CONFLICT (content): Merge conflict in Zend/tests/bug69732.phpt > Automatic merge failed; fix conflicts and then commit the result.