On Sun, 3 Mar 2013, Stas Malyshev wrote: > > 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.
Everytime I want to merge up from PHP-5.3 to 5.4 to 5.5 to master for the timezone database I get conflicts in NEWS, I don't even touch that file. cheers, Derick -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
