From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Wightman Subject: Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template Date: Tue, 20 Mar 2012 10:58:39 -0500 Message-ID: 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 Return-path: Received: from eggs.gnu.org ([208.118.235.92]:41136) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SA1Sh-0006kT-Co for emacs-orgmode@gnu.org; Tue, 20 Mar 2012 11:59:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SA1SN-0000wR-8k for emacs-orgmode@gnu.org; Tue, 20 Mar 2012 11:59:02 -0400 Received: from mail-yx0-f169.google.com ([209.85.213.169]:42947) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SA1SN-0000wB-2H for emacs-orgmode@gnu.org; Tue, 20 Mar 2012 11:58:43 -0400 Received: by yenm8 with SMTP id m8so241050yen.0 for ; Tue, 20 Mar 2012 08:58:40 -0700 (PDT) In-Reply-To: <80ehsn1lvs.fsf@somewhere.org> 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: Sebastien Vauban Cc: emacs-orgmode@gnu.org 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. Just my $0.02. Brian --- MidLifeXis@wightmanfam.org