From mboxrd@z Thu Jan 1 00:00:00 1970 From: torys.anderson@gmail.com (Tory S. Anderson) Subject: Re: Favorite way of syncing? Date: Fri, 11 Sep 2015 09:25:19 -0600 Message-ID: <87d1xpyo4g.fsf@torysa-worldsendless.byu.edu> References: <87twr1c8s3.fsf@yale.edu> <87a8strnm3.fsf@ericabrahamsen.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaQCB-00043c-SO for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 11:25:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaQC7-0004oq-PF for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 11:24:59 -0400 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:35704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaQC7-0004ok-IQ for emacs-orgmode@gnu.org; Fri, 11 Sep 2015 11:24:55 -0400 Received: by pacfv12 with SMTP id fv12so79169739pac.2 for ; Fri, 11 Sep 2015 08:24:54 -0700 (PDT) In-Reply-To: <87a8strnm3.fsf@ericabrahamsen.net> (Eric Abrahamsen's message of "Fri, 11 Sep 2015 23:18:12 +0800") 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 At the moment I'm using a self-hosted OwnCloud to do syncing; it's super easy (takes care of itself), but sometimes conflicts are a problem (particularly when I forget to save my buffers before leaving work); if you notice it, though, it provides a conflict version (and has automatic versioning a la Dropbox). Eric Abrahamsen writes: > jorge.alfaro-murillo@yale.edu (Jorge A. Alfaro-Murillo) writes: > >> Tobias Frischholz writes: >> >>> I was wondering what is your favorite way of syncing your org >>> files >>> and everything. >> [...] >>> I’ve also read about org-sync and magit (git is an option for >>> me). >>> And now I’m starting the get confused. >> >> magit is just the emacs mode for git, if you don't have it and >> use git >> you should really install it. But it does not sync anything you >> still >> have to M-x magit F F and M-x magit P P, for >> pull and >> push. >> >> I have several computers and synchronize my org files with >> git. I >> think it is the best option because I do not have to worry >> about the >> sync not working (for example when I do not have a connection) >> and >> conflicts in the files. > > I do this, too. I don't think Magit helps much, in fact I'd be > better > off writing functions for `emacs-startup-hook' and > `kill-emacs-hook' > that do my pushes and pulls for me. > > But for now, I just try to remember to commit and push before I > leave a > machine. > > This way, you also really learn to appreciate using "git fetch" > and "git > status", rather than doing a blind "git pull". > > Eric > > > -- Tory S. Anderson Computational Cognitive Narratologist http://toryanderson.com