From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Barton Subject: Re: advice needed: how do you guys sync org files between devices? Date: Thu, 04 Jul 2013 09:28:29 +0100 Message-ID: <51D5322D.7000107@wilkesley.net> References: Reply-To: ian@manor-farm.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uueu0-0001yb-H6 for emacs-orgmode@gnu.org; Thu, 04 Jul 2013 04:28:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uuetz-0002T1-1n for emacs-orgmode@gnu.org; Thu, 04 Jul 2013 04:28:32 -0400 Received: from mail2.wilkesley.net ([109.74.196.44]:35296 helo=li40-130.members.linode.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uuety-0002So-S6 for emacs-orgmode@gnu.org; Thu, 04 Jul 2013 04:28:30 -0400 Received: from scamper2.bantercat.co.uk (unknown [46.33.134.31]) (Authenticated sender: lists@wilkesley.net) by li40-130.members.linode.com (Postfix) with ESMTPSA id B68D71CE0CC for ; Thu, 4 Jul 2013 09:28:29 +0100 (BST) In-Reply-To: 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 On 01/07/13 13:06, Xebar Saram wrote: > Hi all > > I have been using dropbox since i started using orgmode a few weeks ago > (yeah im a neewb :)), which kinda works but i find it very annoying as > it keeps creating conflicted copies, isnt reliable on my Linux main > machine etc etc.. > > I was wondering what you guys do for syncing org files between PC's, > Os's, devices (android etc).. > I used to use Dropbox and git. However, as you have found I often got "Conflicted Files". This is a particular problem if it happens in your .git folder, because it can lead to a corrupt git repo. Even though I have a remote git repo, this still lead to lots of wasted time trying to sort out the mess. Recently I have been using BitTorrent Sync from http://labs.bittorrent.com/experiments/sync.html So far this works really well. If you are using Linux you need to do a bit of fiddling to get it to run as your local user, as it doesn't preserve file permissions. So if you are running it as a daemon files at the remote end all get up being owned by root. The default is for two way synchronization. However, it's easy to set up one way sync. This is useful for backups. If you accidentally made a change in your backup, you wouldn't want it pushed back to your aster version. I also run a cron job on my laptop, which is my main work machine. Every hour this commits my org files to my git repo and pushes the changes to my remote on a different computer. Ian.