From mboxrd@z Thu Jan 1 00:00:00 1970 From: Suvayu Ali Subject: Re: [SYNC] How do you sync your org-mode files between n devices (n > 2) Date: Thu, 5 Sep 2013 11:42:34 +0200 Message-ID: <20130905094234.GH19491@kuru.dyndns-at-home.com> References: <20130904060424.GA679@kuru.dyndns-at-home.com> <499DE163-8785-4997-B6F4-1B4475FAD205@gmail.com> <20130904074317.GC679@kuru.dyndns-at-home.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHW5Q-0001mN-Do for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 05:42:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHW5H-0007Tq-So for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 05:42:48 -0400 Received: from mail-ea0-x230.google.com ([2a00:1450:4013:c01::230]:40150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHW5H-0007Tk-LZ for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 05:42:39 -0400 Received: by mail-ea0-f176.google.com with SMTP id q16so763713ead.21 for ; Thu, 05 Sep 2013 02:42:38 -0700 (PDT) Content-Disposition: inline In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Alan Schmitt Cc: emacs-orgmode@gnu.org Hi Alan, On Thu, Sep 05, 2013 at 10:50:18AM +0200, Alan Schmitt wrote: > fatkasuvayu+linux@gmail.com writes: > > > I think the issue with tools like Unison, Dropbox, is conflict > > resolution on simultaneous edits. Traditional version control does a > > better job of that, but then it loses the convenience of these other > > tools. > > > > I believe there is a list member (Alan) close to Unison development; in > > the thread referenced by Samuel there is some discussion on how this > > could be done in a more well defined manner. > > Unison can call external tools to merge conflicting files. If someone > wants to use such a tool with unison, I can definitely give a hand. If you can find the time, I have a somewhat more involved proposal for you :). I think this would be a wonderful addition to Worg. Probably the FAQ is more appropriate (under "Tips and Tricks") since this is one of most commonly asked questions on the list. On the other hand, if you think covering this topic requires more than just a few lines, a longer entry or short article in the config section would be more appropriate. Cheers, -- Suvayu Open source is the future. It sets us free.