From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Newsgroups: gmane.emacs.devel Subject: Re: The ChangeLog and merge conflicts Date: Tue, 10 Feb 2015 01:17:38 +0100 Message-ID: <1870971.ZeOuNpposk@descartes> References: <871tlytyut.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1423527487 11409 80.91.229.3 (10 Feb 2015 00:18:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 10 Feb 2015 00:18:07 +0000 (UTC) Cc: David Kastrup , Artur Malabarba To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 10 01:18:07 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YKyWk-00087r-F1 for ged-emacs-devel@m.gmane.org; Tue, 10 Feb 2015 01:18:06 +0100 Original-Received: from localhost ([::1]:35875 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKyWj-00036a-Mc for ged-emacs-devel@m.gmane.org; Mon, 09 Feb 2015 19:18:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKyWf-00036G-9Y for emacs-devel@gnu.org; Mon, 09 Feb 2015 19:18:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKyWe-0001t7-E4 for emacs-devel@gnu.org; Mon, 09 Feb 2015 19:18:01 -0500 Original-Received: from ptmx.org ([178.63.28.110]:54795) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKyWa-0001sT-I2; Mon, 09 Feb 2015 19:17:56 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id E918B2FA4D; Tue, 10 Feb 2015 01:17:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ptmx.org Original-Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dt5ki5Z11U5U; Tue, 10 Feb 2015 01:17:52 +0100 (CET) Original-Received: from descartes.localnet (chello080109100138.16.15.univie.teleweb.at [80.109.100.138]) by ptmx.org (Postfix) with ESMTPSA id CF9722F954; Tue, 10 Feb 2015 01:17:51 +0100 (CET) User-Agent: KMail/4.13.3 (Linux/3.13.0-44-generic; KDE/4.13.3; x86_64; ; ) In-Reply-To: <871tlytyut.fsf@fencepost.gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 178.63.28.110 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:182765 Archived-At: 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-topleve= l > ChangeLog file merges. For local attributes you can create a .git/info/attributes file. That = will be=20 local to the repo. If you are working with several projects using Chan= geLog=20 files then it probably even makes sense to place it in the global attri= butes=20 file ($XDG_CONFIG_HOME/git/attributes or ~/.config/git/attributes). Regards, R=C3=BCdiger