Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59202 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 97593 invoked from network); 29 Mar 2012 15:07:01 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 29 Mar 2012 15:07:01 -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 74.125.83.42 as permitted sender) X-PHP-List-Original-Sender: mapopa@gmail.com X-Host-Fingerprint: 74.125.83.42 mail-ee0-f42.google.com Received: from [74.125.83.42] ([74.125.83.42:56333] helo=mail-ee0-f42.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 82/F5-59498-39A747F4 for ; Thu, 29 Mar 2012 10:07:01 -0500 Received: by eekb57 with SMTP id b57so1140981eek.29 for ; Thu, 29 Mar 2012 08:06:57 -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=vvP+YGsz3EpH0Gf1GWeoQFIYQX3SWLwxJm6hqbBmK/U=; b=NvwV269afiyrFsXr2rWnsiMv5n7Q2MxpCKNU83dDYhcmiB8daEUTs3XJeUze0CWUmy PW+12iRfRj76PbRBrevWicN4iGSLqD8qSBZBN7tHTbmxVRCP0nbBl6yI9CI+46tWJ1Pb Fm1XB519v2pFXf3GrmVrnM7sTISJ1WVfd/VOgPqTQFdugXotB8GBGGIxi5NqNnAWSkti fUK6Z20uBVCq1puQBZYbZhHvygcQ4P7/MQQ6S0Uht9b2XVtEfCPnbE0W11x2or050R0s cZAqtOtl9yCy4jCQFyZxbmpe/E8txslF8z2QMdLDhOLW+HXSEexOpUV0k7nEvpLmAWDM 80pg== MIME-Version: 1.0 Received: by 10.152.133.9 with SMTP id oy9mr27528233lab.43.1333033617158; Thu, 29 Mar 2012 08:06:57 -0700 (PDT) Received: by 10.152.114.5 with HTTP; Thu, 29 Mar 2012 08:06:57 -0700 (PDT) Date: Thu, 29 Mar 2012 18:06:57 +0300 Message-ID: To: PHP Developers Mailing List Content-Type: text/plain; charset=ISO-8859-1 Subject: Got a git merge conflict in main/output.c From: mapopa@gmail.com (marius adrian popa) I try to push a bug fix https://bugs.php.net/bug.php?id=60947 for php into 5.4 and trunk git merge --no-ff --log PHP-5.3 Auto-merging main/output.c CONFLICT (content): Merge conflict in main/output.c Automatic merge failed; fix conflicts and then commit the result.