Hi Brian, Brian Wightman <midlife...@wightmanfam.org> writes:
> On Tue, Mar 20, 2012 at 7:45 AM, Sebastien Vauban > <wxhgmqzgw...@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 > \ / > \--------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
