From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Qiang Fang <godblessfq@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: Request on modification of org-element.el
Date: Sat, 24 Nov 2018 11:23:34 +0100 [thread overview]
Message-ID: <875zwm3hax.fsf@nicolasgoaziou.fr> (raw)
In-Reply-To: <CAOHC6G8Py69_8mcW-jGgXeW7ugmuJLye1=AJOo6WX9xUyCTZJg@mail.gmail.com> (Qiang Fang's message of "Sat, 24 Nov 2018 10:31:33 +0800")
Hello,
Qiang Fang <godblessfq@gmail.com> writes:
> Hello Nicolas,
> The complete diff is:
>
> $ ~/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.
As I said, I merged "wip-cite" with master two days ago, fixing merge
conflicts along the way. The command above poses no problem here.
Regards,
--
Nicolas Goaziou
next prev parent reply other threads:[~2018-11-24 10:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-23 0:51 Request on modification of org-element.el Qiang Fang
2018-11-23 6:32 ` Nicolas Goaziou
2018-11-24 2:31 ` Qiang Fang
2018-11-24 10:23 ` Nicolas Goaziou [this message]
2018-11-23 6:42 ` Eric S Fraga
2018-11-24 2:35 ` Qiang Fang
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=875zwm3hax.fsf@nicolasgoaziou.fr \
--to=mail@nicolasgoaziou.fr \
--cc=emacs-orgmode@gnu.org \
--cc=godblessfq@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).