From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thierry Banel <tbanelwebmin@free.fr>
Subject: Re: Advice needed: Cant find a decent way to autosync my work TODO
 org file between laptop and work pc
Date: Mon, 26 May 2014 20:08:59 +0200
Message-ID: <5383833B.60004@free.fr>
References: <CAOQHXPoxvoFd4VcFXdARZnhYH4eELca+S-m8bj9eCRz=8vG68g@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36126)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <tbanelwebmin@free.fr>) id 1WozKe-0000bM-Vp
	for emacs-orgmode@gnu.org; Mon, 26 May 2014 14:09:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <tbanelwebmin@free.fr>) id 1WozKa-0004ey-1W
	for emacs-orgmode@gnu.org; Mon, 26 May 2014 14:09:08 -0400
Received: from smtp1-g21.free.fr ([212.27.42.1]:64953)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <tbanelwebmin@free.fr>) id 1WozKZ-0004ef-S9
	for emacs-orgmode@gnu.org; Mon, 26 May 2014 14:09:03 -0400
Received: from [IPv6:2a01:e35:2e21:def0:cdfb:a789:358b:f06a] (unknown
	[IPv6:2a01:e35:2e21:def0:cdfb:a789:358b:f06a])
	by smtp1-g21.free.fr (Postfix) with ESMTP id 3BEE6940137
	for <emacs-orgmode@gnu.org>; Mon, 26 May 2014 20:07:22 +0200 (CEST)
In-Reply-To: <CAOQHXPoxvoFd4VcFXdARZnhYH4eELca+S-m8bj9eCRz=8vG68g@mail.gmail.com>
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

You can try GIT-ANNEX
https://git-annex.branchable.com/

It is a synchronizer built on top of GIT



Le 24/05/2014 07:11, Xebar Saram a =C3=A9crit :
> Hi all
>
> i need to sync my main work TODO org file between my work PC and
> laptop i carry around on work related trips and when im at home. i
> have tried several methods buy really none of them work.
>
> i mainly used git over the last 6 months but that forces me to
> pull/commit/push manually each time i add something to either machine
> and that is really annoying. plus i get merge conflicts all the time
>
> I have tried dropbox at the past but again this causes conflicts, isnt
> reliable to me (on my linux laptop it doesn't always resume sync after
> sleep)
>
> I am using linux (arch linux on laptop  and debian on work PC to be
> precise)
>
> Also i use mobileorg on phones/tablets which works with various levels
> of success :)
>
> any advice would be hugely appreciated!
>
> thanks alot
>
> Z