Re: [O] [PATCH] Add "Time-stamp: <>" in (first 8 lines of) export template

[Brian Wightman]

On Tue, Mar 20, 2012 at 7:45 AM, Sebastien Vauban
<address@hidden> 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
---
address@hidden