From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marc Ihm <marc@ihm.name>
Subject: Re: [SYNC] How do you sync your org-mode files between n devices (n
 > 2)
Date: Thu, 05 Sep 2013 22:00:03 +0200
Message-ID: <5228E2C3.6090605@ihm.name>
References: <m0bo491tdv.fsf@kcals.intra.maillard.im>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54212)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marc@ihm.name>) id 1VHfjM-0002xq-0C
	for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 16:00:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <marc@ihm.name>) id 1VHfjE-0005YV-Ki
	for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 16:00:39 -0400
Received: from smtp01.udag.de ([62.146.106.17]:54942)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <marc@ihm.name>) id 1VHfjE-0005Xn-Ei
	for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 16:00:32 -0400
Received: from [192.168.0.34] (91-67-33-113-dynip.superkabel.de [91.67.33.113])
	by smtp01.udag.de (Postfix) with ESMTPA id 4ECCB82CC8
	for <emacs-orgmode@gnu.org>; Thu,  5 Sep 2013 22:00:29 +0200 (CEST)
In-Reply-To: <m0bo491tdv.fsf@kcals.intra.maillard.im>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: emacs-orgmode@gnu.org

Hi,

My aproach is low-tech.

I manage two special files:
- token.txt, which (through shell-scripts) moves around with me and helps to check,
   that I do not have multiple emacs open on different machines.
- open.txt, which is created by a small piece of elisp and helps to check,
   that I do not have multiple emacs open on the same machine.
With both files I can be sure, that there is only one single instance of emacs open
on all my devices (other instances of emacs at least display a warning message).

Having this, synchronisation with rsync is quite easy.

With this approach I do not have merge conflicts (unless I mess up things occasionally :-).
I use several instances of windows and linux, that are connected by network or usb-stick.

best regards,
Marc