Re: git merge and generated files?

From: Date: Wed, 28 Mar 2012 00:33:21 +0000
Subject: Re: git merge and generated files?
References: 1  Groups: php.internals 
Request: Send a blank email to [email protected] to get a copy of this message 
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.
-- 
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

Thread (9 messages)

« previous php.internals (#59189) next »