Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:66460
Return-Path: <pierre.php@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 88755 invoked from network); 4 Mar 2013 06:20:20 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 4 Mar 2013 06:20:20 -0000
Authentication-Results: pb1.pair.com header.from=pierre.php@gmail.com; sender-id=pass
Authentication-Results: pb1.pair.com smtp.mail=pierre.php@gmail.com; spf=pass; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.217.170 as permitted sender)
X-PHP-List-Original-Sender: pierre.php@gmail.com
X-Host-Fingerprint: 209.85.217.170 mail-lb0-f170.google.com  
Received: from [209.85.217.170] ([209.85.217.170:54863] helo=mail-lb0-f170.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id F3/C2-04779-22D34315 for <internals@lists.php.net>; Mon, 04 Mar 2013 01:20:19 -0500
Received: by mail-lb0-f170.google.com with SMTP id ge1so3689300lbb.29
        for <internals@lists.php.net>; Sun, 03 Mar 2013 22:20:15 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:x-received:in-reply-to:references:date:message-id
         :subject:from:to:cc:content-type;
        bh=g+yj69t+L65s+n3y5/za3SAOox53yq/1eX0hOAjZJAs=;
        b=dg58ZNFsW3jXKn8gJ7BVBQek1ppcB09bgu2PS2SMs80rO3Kl1ittqpK2yUXJOMnPvt
         LUB22SDVU44nUyMdiEbUdOIIv9d2rwXxwrrkxW4M+BRm9NFHskRhATPjPpyF/dWusbmJ
         Z9k7E5iPoWMH/i2dQmBOq9hh34HvDkypdy3dlU+aYFy/Muapf0i+8kPgiC5tS7q7tKKp
         UTHnrY5LdDWsF0PdYVJYNY6bzXc9HynF9zxUNoAXlJf7NA3z52feSI4gp9VVIhIoIGuV
         cYC69TMfeTqQKHbEA+6Xt7XRwsD9jc3Smn/64j9iwc1MhjIlIAxaVK+IM3N07T4G1n0M
         JS8Q==
MIME-Version: 1.0
X-Received: by 10.152.144.105 with SMTP id sl9mr16709953lab.4.1362378015629;
 Sun, 03 Mar 2013 22:20:15 -0800 (PST)
Received: by 10.112.38.199 with HTTP; Sun, 3 Mar 2013 22:20:15 -0800 (PST)
In-Reply-To: <alpine.DEB.2.02.1303031611250.5184@whisky.home.derickrethans.nl>
References: <alpine.DEB.2.02.1303031359360.5184@whisky.home.derickrethans.nl>
	<5133ACB2.9050309@sugarcrm.com>
	<alpine.DEB.2.02.1303031558580.5184@whisky.home.derickrethans.nl>
	<5133BA7A.40002@sugarcrm.com>
	<alpine.DEB.2.02.1303031611250.5184@whisky.home.derickrethans.nl>
Date: Mon, 4 Mar 2013 07:20:15 +0100
Message-ID: <CAEZPtU4YVYH0eWqhJR3_zp8fCyeG5Qgo0XyGLyX5wSTonp19Sw@mail.gmail.com>
To: Derick Rethans <derick@php.net>
Cc: Stas Malyshev <smalyshev@sugarcrm.com>, 
	PHP Developers Mailing List <internals@lists.php.net>, David Soria Parra <dsp@php.net>
Content-Type: text/plain; charset=ISO-8859-1
Subject: Re: [PHP-DEV] NEWS file rename
From: pierre.php@gmail.com (Pierre Joye)

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