From mboxrd@z Thu Jan  1 00:00:00 1970
From: John Kitchin <jkitchin@andrew.cmu.edu>
Subject: Re: emacs & org mode for scholars questions
Date: Wed, 26 Aug 2015 09:06:31 -0400
Message-ID: <m2lhcyb3mw.fsf@andrew.cmu.edu>
References: <55dbff57.2491420a.591b6.5304@mx.google.com>
	<m2oahvcw7a.fsf@andrew.cmu.edu>
	<20150825161008.GK31789@chitra.no-ip.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59074)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <johnrkitchin@gmail.com>) id 1ZUaPV-0004ij-QA
	for emacs-orgmode@gnu.org; Wed, 26 Aug 2015 09:06:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <johnrkitchin@gmail.com>) id 1ZUaPQ-0002LM-WB
	for emacs-orgmode@gnu.org; Wed, 26 Aug 2015 09:06:37 -0400
Received: from mail-qk0-x232.google.com ([2607:f8b0:400d:c09::232]:36583)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <johnrkitchin@gmail.com>) id 1ZUaPQ-0002L7-S4
	for emacs-orgmode@gnu.org; Wed, 26 Aug 2015 09:06:32 -0400
Received: by qkda128 with SMTP id a128so68971705qkd.3
	for <emacs-orgmode@gnu.org>; Wed, 26 Aug 2015 06:06:32 -0700 (PDT)
In-reply-to: <20150825161008.GK31789@chitra.no-ip.org>
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: Suvayu Ali <fatkasuvayu+linux@gmail.com>
Cc: emacs-orgmode@gnu.org


Suvayu Ali writes:

> 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?
It sounds like a great addition, and (unfortunately) a summer project ;)

>
> Cheers,

--
Professor John Kitchin
Doherty Hall A207F
Department of Chemical Engineering
Carnegie Mellon University
Pittsburgh, PA 15213
412-268-7803
@johnkitchin
http://kitchingroup.cheme.cmu.edu