From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Barton Subject: Re: working on cloud Date: Thu, 09 Jan 2014 08:48:34 +0000 Message-ID: <52CE6262.8010405@wilkesley.net> References: <52CDA026.4050402@gmail.com> <87fvoxd3lf.fsf@rudin.co.uk> <877ga9d11a.fsf@rudin.co.uk> 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]:41983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1BIK-0000CJ-1X for emacs-orgmode@gnu.org; Thu, 09 Jan 2014 03:48:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W1BIC-0000bJ-10 for emacs-orgmode@gnu.org; Thu, 09 Jan 2014 03:48:51 -0500 Received: from mail2.wilkesley.net ([109.74.196.44]:46386 helo=li40-130.members.linode.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1BIB-0000b5-QV for emacs-orgmode@gnu.org; Thu, 09 Jan 2014 03:48:43 -0500 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 6718C163973 for ; Thu, 9 Jan 2014 08:48:39 +0000 (UTC) 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 09/01/14 08:36, David Belohrad wrote: > I was using before Dropbox for all sort of syncing, especially my org > mode files, which change quite often. Dropbox is generally very fine (as > well e.g. for sharing screenshots between windows and linux > machines). At certain moment I started to have two issues with this: I have had problems with Dropbox generating "Conflicting files". I think this is because some of my computers are only intermittently connected to Dropbox. Sorting this out can be very time consuming, especially if it happens inside a .git directory. I have now gone down the git route for emacs init files and all my .org files. I keep a separate branch for each computer and do a git pull and git merge when I move to a different computer. This does have some disadvantages - you need to remember to commit and push your changes on each computer. However, sorting out mistakes is generally much easier. Regarding your .emacs you can use elisp to distinguish various bits of your configuration on an OS and computer name basis. Have a look at http://sigquit.wordpress.com/2008/09/28/single-dot-emacs-file/ for a good guide. Ian.