Re: NEWS file rename
| From: | Stas Malyshev | Date: | Sun, 03 Mar 2013 23:15:14 +0000 |
| Subject: | Re: NEWS file rename | ||
| References: | 1 2 3 4 5 6 7 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-66458@lists.php.net to get a copy of this message | ||
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