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 -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
