From mboxrd@z Thu Jan  1 00:00:00 1970
From: Suvayu Ali <fatkasuvayu+linux@gmail.com>
Subject: Re: emacs & org mode for scholars questions
Date: Tue, 25 Aug 2015 18:10:08 +0200
Message-ID: <20150825161008.GK31789@chitra.no-ip.org>
References: <55dbff57.2491420a.591b6.5304@mx.google.com>
	<m2oahvcw7a.fsf@andrew.cmu.edu>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59554)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fatkasuvayu+linux@gmail.com>) id 1ZUGnh-0001HR-41
	for emacs-orgmode@gnu.org; Tue, 25 Aug 2015 12:10:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <fatkasuvayu+linux@gmail.com>) id 1ZUGnc-0000pE-Uw
	for emacs-orgmode@gnu.org; Tue, 25 Aug 2015 12:10:16 -0400
Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:37765)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <fatkasuvayu+linux@gmail.com>) id 1ZUGnc-0000oZ-Or
	for emacs-orgmode@gnu.org; Tue, 25 Aug 2015 12:10:12 -0400
Received: by widdq5 with SMTP id dq5so19610481wid.0
	for <emacs-orgmode@gnu.org>; Tue, 25 Aug 2015 09:10:12 -0700 (PDT)
Received: from chitra.no-ip.org ([2001:610:120:3001:2ad2:44ff:fe4a:b029])
	by smtp.gmail.com with ESMTPSA id r8sm3326810wiz.2.2015.08.25.09.10.10
	for <emacs-orgmode@gnu.org>
	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Tue, 25 Aug 2015 09:10:10 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <m2oahvcw7a.fsf@andrew.cmu.edu>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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

Hi John,

On Tue, Aug 25, 2015 at 09:51:53AM -0400, John Kitchin wrote:
> 
> Most important maybe: figure out how to merge narrative text in version
> control! I don't want to write a sentence per line just to use the
> default merge with git. I really want a word-based track-change like
> diff, and merge.

Ages ago there was a GSoC project, Org merge driver, for use with git.
I don't recall what was the last status.  Okay, found some info:

http://orgmode.org/worg/org-contrib/gsoc2012/student-projects/git-merge-tool/

Would be good to somehow revive this.  I guess it's not an easy problem.
If I remember correctly, there was no prior discussion on the list what
should be the merge strategy.  It happened as the project progressed.  I
think this is one of those projects where a clear path/plan how to
proceed before writing any code would be very beneficial.

Maybe someone can propose a plan?

Cheers,

-- 
Suvayu

Open source is the future. It sets us free.