Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59188 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 86656 invoked from network); 28 Mar 2012 00:14:44 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 28 Mar 2012 00:14:44 -0000 Authentication-Results: pb1.pair.com header.from=pierre.php@gmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=pierre.php@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.160.170 as permitted sender) X-PHP-List-Original-Sender: pierre.php@gmail.com X-Host-Fingerprint: 209.85.160.170 mail-gy0-f170.google.com Received: from [209.85.160.170] ([209.85.160.170:55139] helo=mail-gy0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id BE/11-13163-2F7527F4 for ; Tue, 27 Mar 2012 19:14:43 -0500 Received: by ghbg2 with SMTP id g2so485786ghb.29 for ; Tue, 27 Mar 2012 17:14:40 -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=RugBcpKLCZ+4mbotdh1KnwQIiEIWlQlPDwHL0JxNHvc=; b=FquSusrrl6dNUxk3R34pLJiwUgIBia5gVDkJu6UqjxCB/t3nnrqUfUSGjP5JaAMUAr UqLWtwx53G7vIXa8zXYRNtg1io02BmAxWGU/HPrbzTDKq0TSuAo+RQ/Z3HT/kyaMpSIB Cb9+XYz2ZG8TezA2K8nqgZH4mVxxcsllve2qDlVT4Ugj431+7cSXJxOf11dzshoXQ1am qYMUQwyNwxlVq/KHYwzXX0mXcp1PcIRbeEUqFI+kMqQ1HC9Yek7EXyKYH8xHmFoAIgDx sfvdIYWZsTrd4HS4o76GbQC9ESFZxJJEvqQu2rDjaact4YLqGrutAXidhX4nHLkSmyGT aIPA== MIME-Version: 1.0 Received: by 10.236.168.41 with SMTP id j29mr27875497yhl.24.1332893680198; Tue, 27 Mar 2012 17:14:40 -0700 (PDT) Received: by 10.147.168.16 with HTTP; Tue, 27 Mar 2012 17:14:40 -0700 (PDT) Date: Wed, 28 Mar 2012 02:14:40 +0200 Message-ID: To: PHP internals Content-Type: text/plain; charset=ISO-8859-1 Subject: git merge and generated files? From: pierre.php@gmail.com (Pierre Joye) hi! How do you solve: $ git merge --no-ff --log PHP-5.4 Auto-merging Zend/zend_language_scanner.c CONFLICT (content): Merge conflict in Zend/zend_language_scanner.c Auto-merging Zend/zend_language_scanner_defs.h CONFLICT (content): Merge conflict in Zend/zend_language_scanner_defs.h Automatic merge failed; fix conflicts and then commit the result. so I do not have to resolve them every 2nd commit? This is really annoying :) Thanks for any good idea, Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org