Re: git merge and generated files?
| From: | Pierre Joye | Date: | Wed, 28 Mar 2012 00:38:04 +0000 |
| Subject: | Re: git merge and generated files? | ||
| References: | 1 2 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-59190@lists.php.net to get a copy of this message | ||
On Wed, Mar 28, 2012 at 2:33 AM, Stas Malyshev <smalyshev@sugarcrm.com> 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