On Sun, 3 Mar 2013, Gustavo Lopes wrote: > On Sun, 03 Mar 2013 20:00:47 +0100, Derick Rethans <der...@derickrethans.nl> > 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). > > How does that fix anything? You'll still have a conflict because > you'll be changing a file that doesn't exist in the other branch.
Maybe, but right now it frustrates me every time. > Besides, the solution is well documented on the wiki: > > https://wiki.php.net/vcs/gitfaq#mandatory_git_settings Yeah, right. That is not a solution, but a hack. NEWS should just be outside of GIT at all as you can not rely on everybody having that hack in their config. cheers, Derick -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
