Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:66457 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 57647 invoked from network); 3 Mar 2013 22:33:22 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 3 Mar 2013 22:33:22 -0000 Authentication-Results: pb1.pair.com smtp.mail=tyra3l@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=tyra3l@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.210.182 as permitted sender) X-PHP-List-Original-Sender: tyra3l@gmail.com X-Host-Fingerprint: 209.85.210.182 mail-ia0-f182.google.com Received: from [209.85.210.182] ([209.85.210.182:53459] helo=mail-ia0-f182.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id DD/B2-41723-0BFC3315 for ; Sun, 03 Mar 2013 17:33:20 -0500 Received: by mail-ia0-f182.google.com with SMTP id w21so2290304iac.27 for ; Sun, 03 Mar 2013 14:33:17 -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=3EybsGFYFn6zMhUJWjXBVNcM1qCZqYYUaXZxNoW+anE=; b=u2HTwdSw8rNaeBNAhcwQd99A11nVbd2RlEfihliJtr+bHc9TZf2yPIgQhxKLOQsJ3e A86aK1iJeldjPK9q4ZZPVgovbeQJugUEb9XUdtWu+CjGaGlSnfn1KiHbbGXa5TZ6XKi0 +gqxLN9adZ9TLb/b4W3xI/pACZ8UALW2j9n0bSEsQr+e+bcVG4sOdoE37B29tEJ/cPbA XRoIBT4pmxJZa2hVDN3A+O9vPeRL6MU7Z4QSHFkSMsuRzb4ZswcDk9tvX5pfhKoF7PVA uwWHDPBB/BrGWZfnddBZhxotB39HOIER8zzee5skkE1BzNU2QorfFI79BhGxPj8RIoS7 pZhA== MIME-Version: 1.0 X-Received: by 10.50.212.105 with SMTP id nj9mr900794igc.17.1362349997205; Sun, 03 Mar 2013 14:33:17 -0800 (PST) Received: by 10.50.114.137 with HTTP; Sun, 3 Mar 2013 14:33:17 -0800 (PST) In-Reply-To: <5133BE2A.4000304@sugarcrm.com> References: <5133ACB2.9050309@sugarcrm.com> <5133BA7A.40002@sugarcrm.com> <5133BE2A.4000304@sugarcrm.com> Date: Sun, 3 Mar 2013 23:33:17 +0100 Message-ID: To: Stas Malyshev Cc: Derick Rethans , PHP Developers Mailing List , David Soria Parra Content-Type: multipart/alternative; boundary=14dae93404a3a4b10804d70cd321 Subject: Re: [PHP-DEV] NEWS file rename From: tyra3l@gmail.com (Ferenc Kovacs) --14dae93404a3a4b10804d70cd321 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sun, Mar 3, 2013 at 10:18 PM, Stas Malyshev wrot= e: > Hi! > > > 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. > > Well, I think it works reasonable well (it did for me). It is a hack, > but it gets the job done and it's pretty easy. Maybe it has to be more > visible or if there's some way of integrating it in the repo (like > .gitignore) it'd be excellent, but my git knowledge is not enough for > that. David, any ideas how to make this easier? > -- > Stanislav Malyshev, Software Architect > SugarCRM: http://www.sugarcrm.com/ > (408)454-6900 ext. 227 > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > > I suppose we could use a .gitattributes file: http://blog.mindlesstechie.net/2012/08/17/always-keep-your-copy-of-a-partic= ular-file-in-a-git-merge/ --=20 Ferenc Kov=C3=A1cs @Tyr43l - http://tyrael.hu --14dae93404a3a4b10804d70cd321--