From: Michael Welle <mwe012008@gmx.net>
To: emacs-orgmode@gnu.org
Subject: Re: git and orgmode: teaching git a bit of orgmode syntax
Date: Tue, 24 Jan 2017 19:30:40 +0100 [thread overview]
Message-ID: <87lgu0wbsf.fsf@luisa.c0t0d0s0.de> (raw)
In-Reply-To: <87inp47308.fsf@gmail.com> (Nick Dokos's message of "Tue, 24 Jan 2017 12:59:35 -0500")
Hello,
Nick Dokos <ndokos@gmail.com> 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
next prev parent reply other threads:[~2017-01-24 18:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 15:17 git and orgmode: teaching git a bit of orgmode syntax Karl Voit
2017-01-24 15:34 ` Nick Dokos
2017-01-24 16:10 ` Michael Welle
2017-01-24 17:59 ` Nick Dokos
2017-01-24 18:30 ` Michael Welle [this message]
2017-01-24 16:02 ` Brett Viren
2017-01-24 22:16 ` Stig Brautaset
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=87lgu0wbsf.fsf@luisa.c0t0d0s0.de \
--to=mwe012008@gmx.net \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).