From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Moe Subject: Re: [dev] footnotes improvements Date: Mon, 27 Jun 2011 22:07:53 +0200 Message-ID: <4E08E319.60801@christianmoe.com> References: <871v05f4ca.fsf@gmail.com> <87sjshjt4e.fsf@fastmail.fm> <87ei412amm.fsf@gmail.com> <87fwmvm8l8.fsf@gmail.com> Reply-To: mail@christianmoe.com Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([140.186.70.92]:55863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbI4M-0004PC-Nn for emacs-orgmode@gnu.org; Mon, 27 Jun 2011 16:06:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QbI4L-0005FC-2h for emacs-orgmode@gnu.org; Mon, 27 Jun 2011 16:06:06 -0400 Received: from mars.hitrost.net ([91.185.211.18]:46205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbI4K-0005Ev-Mh for emacs-orgmode@gnu.org; Mon, 27 Jun 2011 16:06:04 -0400 In-Reply-To: <87fwmvm8l8.fsf@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: Nicolas Goaziou Cc: Org Mode 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, >