On Sun, 03 Mar 2013 20:00:47 +0100, Derick Rethans
<der...@derickrethans.nl> wrote:
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).
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.
Besides, the solution is well documented on the wiki:
https://wiki.php.net/vcs/gitfaq#mandatory_git_settings
--
Gustavo Lopes
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
