Re: NEWS file rename

From: Date: Sun, 03 Mar 2013 19:29:16 +0000
Subject: Re: NEWS file rename
References: 1  Groups: php.internals 
Request: Send a blank email to internals+get-66449@lists.php.net to get a copy of this message
On Sun, 03 Mar 2013 20:00:47 +0100, Derick Rethans <derick@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

« previous php.internals (#66449) next »