Re: NEWS file rename
| From: | Derick Rethans | Date: | Sun, 03 Mar 2013 21:12:13 +0000 |
| Subject: | Re: NEWS file rename | ||
| References: | 1 2 3 4 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-66455@lists.php.net to get a copy of this message | ||
On Sun, 3 Mar 2013, Stas Malyshev wrote:
> > 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.
>
> Did you set up git as described in
> https://wiki.php.net/vcs/gitfaq#mandatory_git_settings ?
> Because I
> never had merge conflicts in NEWS, it shouldn't be even possible with
> this setup...
I have never seen that, but I do consider that a hack. You will never
get everybody to make that configuration. Feel free to revert it.
cheers,
Derick