Hi! > I've just renamed the NEWS files to a branch specific variant. NEWS > files should not be merged up (as their contents are not linked) and > they always cause a bit pain when doing automated things (such as the > tzdb update).
I would really prefer first asking, then doing things to stable repos. And NEWS merging is working just fine in git, what exactly is the problem with that? We have special hooks in place just for that, and I have never seen any problem with them. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
