From: Alan Schmitt <alan.schmitt@polytechnique.org>
To: "Jonas Hörsch" <coroa@online.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: [SYNC] How do you sync your org-mode files between ndevices (n > 2))
Date: Thu, 05 Sep 2013 15:03:11 +0200 [thread overview]
Message-ID: <m261ufju9c.fsf@polytechnique.org> (raw)
In-Reply-To: <87bo47try7.fsf@kafka.loc>
coroa@online.de writes:
> On Thu, Sep 05 2013, Karl Voit wrote:
>
>> * Alan Schmitt <alan.schmitt@polytechnique.org> wrote:
>>> I can't promise anything, but I can try to write something. What
>>> external merging tool should I use?
>>
>> I haven't used it yet but I read that Emacs offers some kind of a
>> 3-way-merger ...
>
> and then there is an early git-merge-tool[1] or rather the org-merge-driver
> for git. i've been using it for half a year now for my org files in
> git, although i seldom have conflicts, as we're just a small group.
>
> maybe somebody on the list has more info on its status?
If someone is adventurous enough, the command to use org-merge-driver
with unison would be:
org-merge-driver -- CURRENTARCH CURRENT1 CURRENT2 NEW
(see my other mail for the rest of the details)
Alan
next prev parent reply other threads:[~2013-09-05 13:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-03 21:34 [SYNC] How do you sync your org-mode files between n devices (n > 2) noreply
2013-09-04 6:04 ` Suvayu Ali
2013-09-04 6:30 ` Xiao-Yong Jin
2013-09-04 7:43 ` Suvayu Ali
2013-09-04 8:00 ` Torsten Wagner
2013-09-05 8:50 ` Alan Schmitt
2013-09-05 9:42 ` Suvayu Ali
2013-09-05 10:00 ` Alan Schmitt
2013-09-05 10:26 ` Karl Voit
2013-09-05 11:42 ` Jonas Hörsch
2013-09-05 13:03 ` Alan Schmitt [this message]
2013-09-05 11:25 ` Suvayu Ali
2013-09-05 12:31 ` Alan Schmitt
2013-09-05 12:54 ` Suvayu Ali
2013-09-05 13:24 ` Alan Schmitt
2013-09-05 16:14 ` [SYNC] How do you sync your org-mode files between ndevices (n > 2)) Ramon Diaz-Uriarte
2013-09-05 13:37 ` [SYNC] How do you sync your org-mode files between n devices (n > 2) Robert Horn
2013-09-04 6:21 ` Jambunathan K
2013-09-04 6:47 ` Paul Rudin
2013-09-04 6:50 ` Samuel Loury
2013-09-05 20:00 ` Marc Ihm
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
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=m261ufju9c.fsf@polytechnique.org \
--to=alan.schmitt@polytechnique.org \
--cc=coroa@online.de \
--cc=emacs-orgmode@gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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).