Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:87205 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 37043 invoked from network); 16 Jul 2015 16:41:20 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jul 2015 16:41:20 -0000 Authentication-Results: pb1.pair.com smtp.mail=mapopa@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=mapopa@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.215.43 as permitted sender) X-PHP-List-Original-Sender: mapopa@gmail.com X-Host-Fingerprint: 209.85.215.43 mail-la0-f43.google.com Received: from [209.85.215.43] ([209.85.215.43:34418] helo=mail-la0-f43.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 8F/92-16799-DAED7A55 for ; Thu, 16 Jul 2015 12:41:18 -0400 Received: by lagx9 with SMTP id x9so46847885lag.1 for ; Thu, 16 Jul 2015 09:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=OKOqXxLOndckThxhFA4nHtPv4jQSv/3De8HTYSSxP4g=; b=ET6BnrvtMz4fEps0QAOteT1SCy5DNFBtbk43eMVrhMbAl/sli1dbRIff70Cw+0N/nW XTDX3n2BlLRFQTh/ma8qkAKrnDDSKFEEWdv1oJWDphD8k/Ze19BWMJTaiLaFPxTi7ql1 oQW/JXFGzcU2rQP7nSzwDCBSJrzh+zCrk3UnlPWzQt9ctJWzMPkne4OQCDjeSVGFIQqo emY/n7UOn1iYdFwesFRSziU7pVUkLs7XOzVbq3+6v5tbYijkOvLAeYIMTDId6RiqJzu3 edJNk2I4MHvjphdoByWHzi3gEyYjnLnH4zRnyo4lMmgvYJk1t38qfweRUxTcurkX58sZ Pagw== MIME-Version: 1.0 X-Received: by 10.112.85.3 with SMTP id d3mr10248081lbz.33.1437064874586; Thu, 16 Jul 2015 09:41:14 -0700 (PDT) Received: by 10.114.66.203 with HTTP; Thu, 16 Jul 2015 09:41:14 -0700 (PDT) Date: Thu, 16 Jul 2015 19:41:14 +0300 Message-ID: To: PHP Developers Mailing List Content-Type: multipart/alternative; boundary=001a1134946c5e7b8d051b00bd34 Subject: merging into master question From: mapopa@gmail.com (marius adrian popa) --001a1134946c5e7b8d051b00bd34 Content-Type: text/plain; charset=UTF-8 I have patched pdo_firebird driver in my local branch using this patch https://bugs.php.net/bug.php?id=61183 I have an issue when merging with master 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. --001a1134946c5e7b8d051b00bd34--