Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66458 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 61733 invoked from network); 3 Mar 2013 23:15:19 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 3 Mar 2013 23:15:19 -0000 Authentication-Results: pb1.pair.com header.from=smalyshev@sugarcrm.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=smalyshev@sugarcrm.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain sugarcrm.com designates 173.203.6.155 as permitted sender) X-PHP-List-Original-Sender: smalyshev@sugarcrm.com X-Host-Fingerprint: 173.203.6.155 smtp155.ord.emailsrvr.com Linux 2.6 Received: from [173.203.6.155] ([173.203.6.155:48696] helo=smtp155.ord.emailsrvr.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id A1/23-41723-689D3315 for ; Sun, 03 Mar 2013 18:15:19 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp16.relay.ord1a.emailsrvr.com (SMTP Server) with ESMTP id 9809F3D00C9; Sun, 3 Mar 2013 18:15:16 -0500 (EST) X-Virus-Scanned: OK Received: by smtp16.relay.ord1a.emailsrvr.com (Authenticated sender: smalyshev-AT-sugarcrm.com) with ESMTPSA id 328213D0087; Sun, 3 Mar 2013 18:15:16 -0500 (EST) Message-ID: <5133D982.4040307@sugarcrm.com> Date: Sun, 03 Mar 2013 15:15:14 -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: Ferenc Kovacs CC: PHP Developers Mailing List , David Soria Parra References: <5133ACB2.9050309@sugarcrm.com> <5133BA7A.40002@sugarcrm.com> <5133BE2A.4000304@sugarcrm.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] NEWS file rename From: smalyshev@sugarcrm.com (Stas Malyshev) Hi! > I suppose we could use a .gitattributes file: > http://blog.mindlesstechie.net/2012/08/17/always-keep-your-copy-of-a-particular-file-in-a-git-merge/ You still have to do git config with this solution. The whole problem is that not everybody knows that it needs to be done. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227