Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59190 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 90310 invoked from network); 28 Mar 2012 00:38:08 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 28 Mar 2012 00:38:08 -0000 Authentication-Results: pb1.pair.com smtp.mail=pierre.php@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=pierre.php@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.161.170 as permitted sender) X-PHP-List-Original-Sender: pierre.php@gmail.com X-Host-Fingerprint: 209.85.161.170 mail-gx0-f170.google.com Received: from [209.85.161.170] ([209.85.161.170:49062] helo=mail-gx0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 08/D1-13163-F6D527F4 for ; Tue, 27 Mar 2012 19:38:07 -0500 Received: by ggmb2 with SMTP id b2so441938ggm.29 for ; Tue, 27 Mar 2012 17:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=AiyeSa9uS/uz/NGohazE0dYa+Oy9V2heHR0GL6w/bXk=; b=NymBpIxfBMuQC0NMbNKIXHBPPKmexl6RapWu1qfILjfN+nPs1pM14ge7yBrBmEBtex Ub05pSHY+qpDJ4jtAyWpq/fSWU4YziBOoIAfM1qyZzBvwCwDj2wJjJcAc6HESvK7RFyv gdnH10S1ugPS6/dTf8aJ9osDEGcJMVdub9DqRSlFglltrUX3tSnFUIYDrXCogvNJbrlZ l37YxzeOzj25BWXTrrouNhLQzCauKzG9tnFw5OftoqJdcnsjY4GWenrouCgMb4ebTO5F GCrl9VnnSct5JsbMUVslZdIrni8/oHthqZgtdZVSPHb5+1jf+9MqZu+lfnRtOkqLjsoW QKgg== MIME-Version: 1.0 Received: by 10.236.114.168 with SMTP id c28mr14357705yhh.58.1332895084230; Tue, 27 Mar 2012 17:38:04 -0700 (PDT) Received: by 10.147.168.16 with HTTP; Tue, 27 Mar 2012 17:38:04 -0700 (PDT) In-Reply-To: <4F725C51.1020207@sugarcrm.com> References: <4F725C51.1020207@sugarcrm.com> Date: Wed, 28 Mar 2012 02:38:04 +0200 Message-ID: To: Stas Malyshev Cc: PHP internals Content-Type: text/plain; charset=ISO-8859-1 Subject: Re: [PHP-DEV] git merge and generated files? From: pierre.php@gmail.com (Pierre Joye) On Wed, Mar 28, 2012 at 2:33 AM, Stas Malyshev wrote: > Hi! > >> $ 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? > > Why would these change every 2nd commit? These only should change when > you change the scanner, which happens very rarely. It depends what you do, but still annoying when it happens. But that does not answer the question... cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org