From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karl Voit Subject: Re: [SYNC] How do you sync your org-mode files between n devices (n > 2) Date: Thu, 5 Sep 2013 12:26:07 +0200 Message-ID: <2013-09-05T12-22-50@devnull.Karl-Voit.at> References: <20130904060424.GA679@kuru.dyndns-at-home.com> <499DE163-8785-4997-B6F4-1B4475FAD205@gmail.com> <20130904074317.GC679@kuru.dyndns-at-home.com> <20130905094234.GH19491@kuru.dyndns-at-home.com> Reply-To: news1142@Karl-Voit.at Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHWld-0004uQ-KF for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 06:26:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHWlX-0004Kn-5C for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 06:26:25 -0400 Received: from plane.gmane.org ([80.91.229.3]:39303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHWlW-0004Ka-Ti for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 06:26:19 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VHWlV-0005Dt-Sd for emacs-orgmode@gnu.org; Thu, 05 Sep 2013 12:26:17 +0200 Received: from mail.michael-prokop.at ([88.198.6.110]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 05 Sep 2013 12:26:17 +0200 Received: from news1142 by mail.michael-prokop.at with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 05 Sep 2013 12:26:17 +0200 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: emacs-orgmode@gnu.org * Alan Schmitt wrote: > Hi, Hi, > fatkasuvayu+linux@gmail.com writes: > >> I think this would be a wonderful addition to Worg. Absolutely! I am using unison as well. So far, I resolved conflicts (I try to do anything I can to avoid them) very basic manually. I'd love to learn how to do it with software support in a quick how-to. > 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 ... -- mail|git|SVN|photos|postings|SMS|phonecalls|RSS|CSV|XML to Org-mode: > get Memacs from https://github.com/novoid/Memacs < https://github.com/novoid/extract_pdf_annotations_to_orgmode + more on github