Merge conflict in Orgmode.org's master repo

[kjambunathan]

$ ~/src$ git clone https://code.orgmode.org/bzg/org-mode.git
$ cd org-mode
$ git merge origin/wip-cite

Auto-merging testing/lisp/test-org-element.el
Auto-merging lisp/org-element.el
CONFLICT (content): Merge conflict in lisp/org-element.el
Automatic merge failed; fix conflicts and then commit the result.

$ git diff
diff --cc lisp/org-element.el
index cdb574e17,f7498fbd1..000000000
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@@ -307,12 -322,11 +322,20 @@@ Don't modify it, set `org-element-affil
        (strike-through ,@standard-set)
        (subscript ,@standard-set)
        (superscript ,@standard-set)
++<<<<<<< HEAD
 +      ;; Ignore inline babel call and inline source block as formulas
 +      ;; are possible.  Also ignore line breaks and statistics
 +      ;; cookies.
 +      (table-cell bold code entity export-snippet footnote-reference italic
 +                latex-fragment link macro radio-target strike-through
 +                subscript superscript target timestamp underline verbatim)
++=======
+       ;; Ignore inline babel call and inline src block as formulas are
+       ;; possible.  Also ignore line breaks and statistics cookies.
+       (table-cell ,@(append '(export-snippet footnote-reference link macro
+                                            radio-target target timestamp)
+                           minimal-set))
++>>>>>>> origin/wip-cite
        (table-row table-cell)
        (underline ,@standard-set)
        (verse-block ,@standard-set)))

@pierwill, @QiangF

Could you please bring the above merge conflict to the attention of Nicolas Goziou @ Emacs Orgmode ML. This is solely an upstream issue on Orgmode.org's side, and the issue has nothing to do with changes specific to my repository.

[kjambunathan]

I have upgraded this to org-9.1.14. This is the version that is on https://elpa.gnu.org/packages. FWIW, the merge conflict that happens with Orgmode.org's master branch doesn't happen with this release_9.1.14.

I would still request one of you to report the original conflict to the Orgmode.org repository for resolution at their end. You may also want to inform Orgmode.org users about the new ELPA repository for ODT exporter.

[QiangF]

@kjambunathan I am very glad you are making a MELPA package. I have sent the request to the org mailing list. Thank you!

[kjambunathan]

@kjambunathan I am very glad you are making a MELPA package. I have sent the request to the org mailing list. Thank you!

Thanks @QiangF. I have seen Ngz's message in the Orgmode mailing list. The conflict I reported is resolved.

I am very glad you are making a MELPA package

I haven't made up my mind if I should put it in https://melpa.org. For now, you can ox-odt.el' and ox-jabref.el' (tested against Org-9.1.14) are installable from https://raw.githubusercontent.com/kjambunathan/org-mode-ox-odt/master/elpa/. Please reconfigure your package-archives to include above url and see if everything is good.

[pierwill]

Thanks @kjambunathan ! I've been using your ox-odt for my dissertation.

I'll test out the new install method and report back—

[pierwill]

I've tested the current merge, and this works great with 9.1.14! Thanks! (I've been using org-mode-ox-odt for my dissertation and loving it!)

I'm using https://github.com/cask/cask to manage packages, and it doesn't have a way to do custom sources, so I haven't tested the new install method.

@kjambunathan Having this at MELPA would be excellent, if you choose to go that way.