[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [O] [SYNC] How do you sync your org-mode files between ndevices (n >
From: |
Alan Schmitt |
Subject: |
Re: [O] [SYNC] How do you sync your org-mode files between ndevices (n > 2)) |
Date: |
Thu, 05 Sep 2013 15:03:11 +0200 |
User-agent: |
mu4e 0.9.9.5; emacs 24.3.1 |
address@hidden writes:
> 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?
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
- [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, 2013/09/05
- Re: [O] [SYNC] How do you sync your org-mode files between ndevices (n > 2)),
Alan Schmitt <=
- 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
Re: [O] [SYNC] How do you sync your org-mode files between n devices (n > 2), Marc Ihm, 2013/09/05