emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Suvayu Ali <fatkasuvayu+linux@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: emacs & org mode for scholars questions
Date: Tue, 25 Aug 2015 18:10:08 +0200	[thread overview]
Message-ID: <20150825161008.GK31789@chitra.no-ip.org> (raw)
In-Reply-To: <m2oahvcw7a.fsf@andrew.cmu.edu>

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.

next prev parent reply	other threads:[~2015-08-25 16:10 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-25  5:38 emacs & org mode for scholars questions Erik Hetzner
2015-08-25 13:51 ` John Kitchin
2015-08-25 15:04   ` Matt Price
2015-08-25 15:16   ` Eric S Fraga
2015-08-25 20:18     ` John Kitchin
2015-08-26  9:30       ` Eric S Fraga
2015-08-26 10:39         ` John Kitchin
2015-08-26 11:07           ` Eric S Fraga
2015-08-26 13:04             ` John Kitchin
2015-08-25 16:10   ` Suvayu Ali [this message]
2015-08-26 13:06     ` John Kitchin
2015-08-27  5:21   ` Marcin Borkowski
2015-08-27 10:31     ` John Kitchin
2015-08-25 16:48 ` Thomas S. Dye
2015-08-25 17:23   ` Eric S Fraga
2015-09-02  4:03 ` Erik Hetzner
2015-09-02 10:40   ` John Kitchin
2015-09-03  2:00     ` Erik Hetzner
2015-09-05  0:29       ` John Kitchin
2015-09-05 14:08         ` Thierry Banel
2015-09-04  6:44     ` Christian Wittern
2015-09-04  7:45       ` Rasmus
2015-09-02 11:00   ` Rasmus
2015-09-02 12:33     ` Xebar Saram
2015-09-02 12:51       ` Rasmus
2015-09-02 13:17         ` Marcin Borkowski
2015-09-02 14:53     ` Jorge A. Alfaro-Murillo
2015-09-03  2:10     ` Erik Hetzner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150825161008.GK31789@chitra.no-ip.org \
    --to=fatkasuvayu+linux@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).