emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Brian Wightman <MidLifeXis@wightmanfam.org>
To: Sebastien Vauban <wxhgmqzgwmuf@spammotel.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template
Date: Tue, 20 Mar 2012 10:58:39 -0500	[thread overview]
Message-ID: <CALbR6203WywBoj6_9qG7B5v7yEbjG3YVj49B730yigincjPhYg@mail.gmail.com> (raw)
In-Reply-To: <80ehsn1lvs.fsf@somewhere.org>

On Tue, Mar 20, 2012 at 7:45 AM, Sebastien Vauban
<wxhgmqzgwmuf@spammotel.com> 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
\                     /

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.


  reply	other threads:[~2012-03-20 15:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-16 15:01 [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template Sebastien Vauban
2012-03-20 11:49 ` Bastien
2012-03-20 12:45   ` Sebastien Vauban
2012-03-20 15:58     ` Brian Wightman [this message]
2012-03-23 14:10       ` Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CALbR6203WywBoj6_9qG7B5v7yEbjG3YVj49B730yigincjPhYg@mail.gmail.com \
    --to=midlifexis@wightmanfam.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=wxhgmqzgwmuf@spammotel.com \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).