[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: The ChangeLog and merge conflicts
|
From: |
Rüdiger Sonderfeld |
|
Subject: |
Re: The ChangeLog and merge conflicts |
|
Date: |
Tue, 10 Feb 2015 01:17:38 +0100 |
|
User-agent: |
KMail/4.13.3 (Linux/3.13.0-44-generic; KDE/4.13.3; x86_64; ; ) |
On Tuesday 10 February 2015 01:05:30 David Kastrup wrote:
> It's still sort of a nuisance to maintain the corresponding entry in the
> top level .gitattributes file (since it is itself under version
> control), but at least this works reasonably well for the non-toplevel
> ChangeLog file merges.
For local attributes you can create a .git/info/attributes file. That will be
local to the repo. If you are working with several projects using ChangeLog
files then it probably even makes sense to place it in the global attributes
file ($XDG_CONFIG_HOME/git/attributes or ~/.config/git/attributes).
Regards,
Rüdiger