On Wed, Mar 28, 2012 at 2:33 AM, Stas Malyshev <smalys...@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 -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
