From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Richard Subject: Re: advice needed: how do you guys sync org files between devices? Date: Thu, 04 Jul 2013 10:57:36 +0200 Message-ID: <87zju2zoqn.fsf@yahoo.fr> References: <51D5322D.7000107@wilkesley.net> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UufM6-0004fn-P5 for emacs-orgmode@gnu.org; Thu, 04 Jul 2013 04:57:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UufM5-0005Yp-GP for emacs-orgmode@gnu.org; Thu, 04 Jul 2013 04:57:34 -0400 Received: from mxin.ulb.ac.be ([164.15.128.112]:34098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UufM5-0005YR-An for emacs-orgmode@gnu.org; Thu, 04 Jul 2013 04:57:33 -0400 In-Reply-To: <51D5322D.7000107@wilkesley.net> (Ian Barton's message of "Thu, 04 Jul 2013 09:28:29 +0100") 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: ian@manor-farm.org Cc: emacs-orgmode@gnu.org Ian Barton writes: > 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. I use Dropbox+git with colleagues : Dropbox synchronizes the data almost real time, whereas git tracks the changes. I commit manually when I see meaningful changes. Wrt the .git directory, I simply ask Dropbox to ignore it [on command line, "dropbox exclude add Dropbox/foo/bar/.git" -- which can be done even before initializing the git repo in Dropbox/foo/bar] Btw I know that Dropbox has "change tracking" facilities too but I dislike the UI (via a website). Also, I usually keep a local clone of my "Dropbox repositories" (which are cheap with git, thanks to hard links) that I can use to make temprorary checkout of older revisions without my colleages getting hundreds of file "updates". For the same reason I (almost) don't use branches in these repos, since switching branches is not Dropbox-friendly. -- Nico.