From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stig Brautaset Subject: Best strategy for sharing agenda between two machines? Date: Mon, 24 Feb 2020 21:04:52 +0000 Message-ID: Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:54155) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6KuU-0003SA-OJ for emacs-orgmode@gnu.org; Mon, 24 Feb 2020 16:05:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6KuT-00018e-2n for emacs-orgmode@gnu.org; Mon, 24 Feb 2020 16:05:02 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:60981) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6KuS-00017X-S7 for emacs-orgmode@gnu.org; Mon, 24 Feb 2020 16:05:01 -0500 Received: from localhost (host86-130-183-19.range86-130.btcentralplus.com [86.130.183.19]) (Authenticated sender: stig@brautaset.org) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id EA39DFF807 for ; Mon, 24 Feb 2020 21:04:56 +0000 (UTC) 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-mx.org@gnu.org Sender: "Emacs-orgmode" To: emacs-orgmode@gnu.org Hi, I use Org mode & agenda on both my personal and work machines, in a private git repo repository. I use auto-commit and push automatically from each machine. It works alright. New items go in inbox.org, and I refile most to tasks.org, which has a structure a little like this: * Home :@home: ** TODO Some task to do at home ** TODO Another task to do at home * Work :@work: ** TODO A task to do at work ** TODO Another work task * TODO Some task that is not inherently work/home * WAITING Another task that blurs the barriers The different sections for Home and Work means that there are not too many merge conflicts. However, inbox.org is a different matter. My todo template adds a LOGBOOK with an `Added' property, and it's almost impossible to resolve the conflicts that result. I see that https://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/ sadly never produced a tool. But I'm wondering if people have some strategy for how to best deal with git conflicts (perhaps a non-default merge strategy works better with Org?) or maybe even better: how not to create conflicts in the first place! I could use a different default agenda file for each machine, since the inbox.org is worst affected. Is anyone doing this? I could extend this to use {work,home}_tasks.org too, but I kinda like having that "neither @work nor @home" option... Decisions decisions. Stig