From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: Re: Request on modification of org-element.el
Date: Sat, 24 Nov 2018 11:23:34 +0100
Message-ID: <875zwm3hax.fsf@nicolasgoaziou.fr>
References: <CAOHC6G88KG141ismoVPDZyTtJBHYTrHDtf7G4XNky+AExEcckQ@mail.gmail.com>
	<87va4ol2xk.fsf@nicolasgoaziou.fr>
	<CAOHC6G8Py69_8mcW-jGgXeW7ugmuJLye1=AJOo6WX9xUyCTZJg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43270)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1gQV6D-00006U-FI
	for emacs-orgmode@gnu.org; Sat, 24 Nov 2018 05:23:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1gQV6A-0000rz-CY
	for emacs-orgmode@gnu.org; Sat, 24 Nov 2018 05:23:41 -0500
Received: from relay1-d.mail.gandi.net ([217.70.183.193]:42673)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <mail@nicolasgoaziou.fr>)
	id 1gQV6A-0000qL-6F
	for emacs-orgmode@gnu.org; Sat, 24 Nov 2018 05:23:38 -0500
In-Reply-To: <CAOHC6G8Py69_8mcW-jGgXeW7ugmuJLye1=AJOo6WX9xUyCTZJg@mail.gmail.com>
	(Qiang Fang's message of "Sat, 24 Nov 2018 10:31:33 +0800")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode/>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: "Emacs-orgmode"
	<emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
To: Qiang Fang <godblessfq@gmail.com>
Cc: emacs-orgmode@gnu.org

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