emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Christian Moe <mail@christianmoe.com>
To: Nicolas Goaziou <n.goaziou@gmail.com>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: Re: [dev] footnotes improvements
Date: Mon, 27 Jun 2011 22:07:53 +0200	[thread overview]
Message-ID: <4E08E319.60801@christianmoe.com> (raw)
In-Reply-To: <87fwmvm8l8.fsf@gmail.com>

Hi,

I get merge conflicts (see below), and this is not a good time to work 
on improving my git skills (deadlines looming). If there's something 
simple you can tell me to do, I'll try it. Otherwise I'll have to pass 
on the testing, sorry.

Yours,
Christian


git checkout footnote-fix
git pull
remote: Counting objects: 78, done.
remote: Compressing objects: 100% (21/21), done.
remote: Total 69 (delta 56), reused 61 (delta 48)
Unpacking objects: 100% (69/69), done.
 From git://github.com/ngz/org-mode-lists
  + fab506e...0431c5f footnote-fix -> ngz/footnote-fix  (forced update)
    d6aba4d..2422172  master     -> ngz/master
Auto-merging lisp/org-docbook.el
CONFLICT (content): Merge conflict in lisp/org-docbook.el
Auto-merging lisp/org-exp.el
CONFLICT (content): Merge conflict in lisp/org-exp.el
Auto-merging lisp/org-footnote.el
CONFLICT (content): Merge conflict in lisp/org-footnote.el
Auto-merging lisp/org-html.el
CONFLICT (content): Merge conflict in lisp/org-html.el
Auto-merging lisp/org-latex.el
CONFLICT (content): Merge conflict in lisp/org-latex.el
Auto-merging lisp/org.el
CONFLICT (content): Merge conflict in lisp/org.el
Automatic merge failed; fix conflicts and then commit the result.


On 6/27/11 8:29 PM, Nicolas Goaziou wrote:
 > Hello,
 >
 > I've made some additional changes to the footnote branch, and fixed
 > a merge conflict due to a recent patch.
 >
 > Since Org 7.6 is about to be released, I'd appreciate if someone using
 > footnotes could test it and report back the results here. If some
 > serious problem arises, its integration will be delayed until 7.7.
 >
 > Thank you for any help,
 >
 > Regards,
 >

  reply	other threads:[~2011-06-27 20:06 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-11 19:02 Nicolas Goaziou
2011-05-12  7:19 ` Christian Moe
2011-05-12  8:10   ` Aankhen
2011-05-12 10:04   ` Nicolas Goaziou
2011-05-12 10:48     ` Christian Moe
2011-05-14  8:44       ` Nicolas Goaziou
2011-05-14 18:22         ` Christian Moe
2011-05-14 13:42 ` Matt Lundin
2011-05-15 14:59   ` Nicolas Goaziou
2011-05-15 15:47     ` Matt Lundin
2011-05-26 19:49       ` Nicolas Goaziou
2011-05-26 20:56         ` Samuel Wales
2011-05-26 23:41           ` suvayu ali
2011-05-15 15:52     ` Samuel Wales
2011-06-27 18:29       ` Nicolas Goaziou
2011-06-27 20:07         ` Christian Moe [this message]
2011-06-27 20:24           ` Nicolas Goaziou
2011-06-27 22:45         ` Christian Moe
2011-06-28  9:59         ` Bastien
2011-06-30  6:14           ` Samuel Wales
2011-06-30  9:15             ` Bastien
2011-06-30 17:36             ` Nicolas Goaziou
2011-07-04 23:26               ` Samuel Wales

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=4E08E319.60801@christianmoe.com \
    --to=mail@christianmoe.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=n.goaziou@gmail.com \
    /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).