[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] [SYNC] How do you sync your org-mode files between n devices (n
|
From: |
Jonas Hörsch |
|
Subject: |
Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2) |
|
Date: |
Thu, 05 Sep 2013 13:42:56 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) |
On Thu, Sep 05 2013, Karl Voit wrote:
> * Alan Schmitt <address@hidden> 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?
cheers,
jonas
Footnotes:
[1]
http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/index.html
pgp5ogtwSItGL.pgp
Description: PGP signature
- [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), noreply, 2013/09/03
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Suvayu Ali, 2013/09/04
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Xiao-Yong Jin, 2013/09/04
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Suvayu Ali, 2013/09/04
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Torsten Wagner, 2013/09/04
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Alan Schmitt, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Suvayu Ali, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Alan Schmitt, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Karl Voit, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2),
Jonas Hörsch <=
- Re: [O] [SYNC] How do you sync your org-mode files between ndevices (n > 2)), Alan Schmitt, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Suvayu Ali, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Alan Schmitt, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Suvayu Ali, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Alan Schmitt, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between ndevices (n > 2)), Ramon Diaz-Uriarte, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Robert Horn, 2013/09/05
Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Paul Rudin, 2013/09/04
Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Samuel Loury, 2013/09/04
Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Jambunathan K, 2013/09/05