Re: NEWS file rename
| From: | Pierre Joye | Date: | Mon, 04 Mar 2013 06:20:15 +0000 |
| Subject: | Re: NEWS file rename | ||
| References: | 1 2 3 4 5 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-66460@lists.php.net to get a copy of this message | ||
On Sun, Mar 3, 2013 at 10:12 PM, Derick Rethans <derick@php.net> wrote:
> 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...
>
> Feel free to revert it.
Huh well... Apparently not a lot of people like this change, if one
has to do it then you :-)
Cheers,
--
Pierre
@pierrejoye