Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66454 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 48551 invoked from network); 3 Mar 2013 21:02:56 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 3 Mar 2013 21:02:56 -0000 Authentication-Results: pb1.pair.com smtp.mail=smalyshev@sugarcrm.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=smalyshev@sugarcrm.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 67.192.241.163 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 67.192.241.163 smtp163.dfw.emailsrvr.com Linux 2.6 Received: from [67.192.241.163] ([67.192.241.163:41532] helo=smtp163.dfw.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 16/21-41723-F7AB3315 for ; Sun, 03 Mar 2013 16:02:55 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp26.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 41E41801AA; Sun, 3 Mar 2013 16:02:52 -0500 (EST) X-Virus-Scanned: OK Received: by smtp26.relay.dfw1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 9D4F98010F; Sun, 3 Mar 2013 16:02:51 -0500 (EST) Message-ID: <5133BA7A.40002@sugarcrm.com> Date: Sun, 03 Mar 2013 13:02:50 -0800 Organization: SugarCRM User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:17.0) Gecko/20130216 Thunderbird/17.0.3 MIME-Version: 1.0 To: Derick Rethans CC: PHP Developers Mailing List , David Soria Parra References: <5133ACB2.9050309@sugarcrm.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] NEWS file rename From: smalyshev@sugarcrm.com (Stas Malyshev) Hi! > 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... -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227