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,
>
