From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karl Voit Subject: Re: advice needed: how do you guys sync org files between devices? Date: Tue, 2 Jul 2013 10:03:57 +0200 Message-ID: <2013-07-02T10-01-21@devnull.Karl-Voit.at> References: <2013-07-01T19-47-18@devnull.Karl-Voit.at> 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]:43024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtvZL-0005Jg-8m for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 04:04:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UtvZJ-0007qK-KI for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 04:04:11 -0400 Received: from plane.gmane.org ([80.91.229.3]:51335) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UtvZJ-0007q3-Cr for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 04:04:09 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1UtvZH-0003jM-Ji for emacs-orgmode@gnu.org; Tue, 02 Jul 2013 10:04:07 +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 ; Tue, 02 Jul 2013 10:04:07 +0200 Received: from news1142 by mail.michael-prokop.at with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Jul 2013 10:04:07 +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: > devnull@Karl-Voit.at writes: > >> Unison does not offer any merge functionality. However, you can >> easily use third party tools to handle merge conflicts (Emacs, vim, >> ...). > > (Disclaimer, I participate in Unison's development). Jay! \o/ > Just to clarify what I think Karl is saying: one can plug in > external tools to handle merge into unison, these tools can be > specialized depending on the file name (for instance the file > extension) or the file path. Getting the correct configuration > line may be tricky, but I, or people on the unison-users mailing > list, are ready to help. Of course. Thanks for clarifying! Alan, how about a short how-to on Worg about Unison and Org-mode methods? -- 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