all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Bastien <bzg@gnu.org>
To: Dror Atariah <drorata@gmail.com>
Cc: Emacs-orgmode@gnu.org
Subject: Re: Line breaks in org-mode having version control in mind
Date: Mon, 04 Nov 2013 12:23:17 +0100	[thread overview]
Message-ID: <87wqko9zru.fsf@bzg.ath.cx> (raw)
In-Reply-To: <CF489715-5A5F-4761-968C-D582627E0D3B@gmail.com> (Dror Atariah's message of "Sun, 3 Nov 2013 21:28:09 +0100")

Hi Dror,

Dror Atariah <drorata@gmail.com> writes:

> What other issues are there? What do you do when you keep
> your org file under VC?

Only a small part of the answer, but you might be interested
in the Git Org merge driver:

http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/

-- 
 Bastien

  parent reply	other threads:[~2013-11-04 11:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-03 20:28 Line breaks in org-mode having version control in mind Dror Atariah
2013-11-03 21:05 ` Jambunathan K
2013-11-04 11:23 ` Bastien [this message]
2013-11-04 19:32 ` Samuel Wales
2013-11-07 16:54 ` Eric S Fraga

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to=87wqko9zru.fsf@bzg.ath.cx \
    --to=bzg@gnu.org \
    --cc=Emacs-orgmode@gnu.org \
    --cc=drorata@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.