From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Subject: Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template Date: Fri, 23 Mar 2012 15:10:27 +0100 Message-ID: <87vclv1k8c.fsf@gnu.org> References: <80y5s2u8ix.fsf@somewhere.org> <87limvo5ki.fsf@gnu.org> <80ehsn1lvs.fsf@somewhere.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([208.118.235.92]:34678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SB5B4-0002ZN-Gn for emacs-orgmode@gnu.org; Fri, 23 Mar 2012 10:09:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SB5Ay-0006Vq-1z for emacs-orgmode@gnu.org; Fri, 23 Mar 2012 10:09:14 -0400 Received: from incoming2.cnam.fr ([163.173.128.34]:20552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SB5Ax-0006Va-Rr for emacs-orgmode@gnu.org; Fri, 23 Mar 2012 10:09:07 -0400 In-Reply-To: (Brian Wightman's message of "Tue, 20 Mar 2012 10:58:39 -0500") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Brian Wightman Cc: Sebastien Vauban , emacs-orgmode@gnu.org Hi Brian, Brian Wightman writes: > On Tue, Mar 20, 2012 at 7:45 AM, Sebastien Vauban > wrote: >> Then, I can provide a patch with `time-stamp' function added to >> `before-save-hook' in Org mode. > > I would lobby against this being the default template, as these time > stamps really mess up the ability to merge org files from multiple > branches without conflicts. > > A ------- B ------- D > \ / > \--------C--------/ > > At the merge, D would have a conflict to resolve by hand. > > I used timestamps and the save hook mentioned above for a while and > ended up needing to do unnecessary (and in the context of a rev > control like GIT - non-useful) manual conflict resolution, so have > since removed them from every file I had previously added them to. I agree adding Time-stamp as a keyword could lead to such problems. So unless there are new arguments for such an inclusion, I'm closing this right now. Sébastien, if you have your own hack for this, please share it on Worg! Best, -- Bastien