From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Welle Subject: Re: git and orgmode: teaching git a bit of orgmode syntax Date: Tue, 24 Jan 2017 19:30:40 +0100 Message-ID: <87lgu0wbsf.fsf@luisa.c0t0d0s0.de> References: <2017-01-24T16-07-08@devnull.Karl-Voit.at> <87mveg79qm.fsf@gmail.com> <87tw8ol9q1.fsf@luisa.c0t0d0s0.de> <87inp47308.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cW5rk-0001gl-2Y for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 13:30:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cW5rg-0000ZX-NI for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 13:30:48 -0500 Received: from mout.gmx.net ([212.227.15.19]:62232) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cW5rg-0000Yl-A8 for emacs-orgmode@gnu.org; Tue, 24 Jan 2017 13:30:44 -0500 Received: from stella.c0t0d0s0.de ([89.204.139.7]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0Lymoh-1cPiMf0aE3-0167zN for ; Tue, 24 Jan 2017 19:30:42 +0100 Received: from Stella (stella.c0t0d0s0.de [192.168.42.1]) by stella.c0t0d0s0.de (Postfix) with ESMTP id 613C4C45FC for ; Tue, 24 Jan 2017 19:30:40 +0100 (CET) In-Reply-To: <87inp47308.fsf@gmail.com> (Nick Dokos's message of "Tue, 24 Jan 2017 12:59:35 -0500") 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" To: emacs-orgmode@gnu.org Hello, Nick Dokos writes: [...] > Thanks. It is quite likely that I misremembered: I found some things on Worg > about an org-aware merge tool for git: > > http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/proposal.html > http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/ > > but not for a diff tool. And I'm not sure it ever saw the light of day. I will have a look at it later this week. If you have enough information to perform a semantic merge, there should be also enough information to spit out a diff. Defining what a difference is in Org would be a starting point. An implementation will follow then. Maybe a task for the next winter ;). Regards hmw