From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alan Schmitt Subject: Re: [SYNC] How do you sync your org-mode files between n devices (n > 2) Date: Thu, 05 Sep 2013 10:50:18 +0200 Message-ID: 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 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHVGm-00033f-1J for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 04:50:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHVGe-0000SC-P5 for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 04:50:27 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:47627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHVGe-0000S4-IY for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 04:50:20 -0400 In-reply-to: <20130904074317.GC679@kuru.dyndns-at-home.com> 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: Suvayu Ali Cc: emacs-orgmode@gnu.org 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. Alan