From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: David Belohrad <david@belohrad.ch>
Newsgroups: gmane.emacs.help
Subject: ediff to combine A and B
Date: Fri, 16 Jan 2015 10:50:33 +0100
Message-ID: <uaxlhl39hqu.fsf@beesknees.cern.ch>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
X-Trace: ger.gmane.org 1421401857 28463 80.91.229.3 (16 Jan 2015 09:50:57 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Fri, 16 Jan 2015 09:50:57 +0000 (UTC)
To: "help-gnu-emacs" <help-gnu-emacs@gnu.org>
Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Jan 16 10:50:56 2015
Return-path: <help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org>
Envelope-to: geh-help-gnu-emacs@m.gmane.org
Original-Received: from lists.gnu.org ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org>)
	id 1YC3YN-0000No-FP
	for geh-help-gnu-emacs@m.gmane.org; Fri, 16 Jan 2015 10:50:55 +0100
Original-Received: from localhost ([::1]:54862 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org>)
	id 1YC3YM-0001wO-VT
	for geh-help-gnu-emacs@m.gmane.org; Fri, 16 Jan 2015 04:50:54 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39233)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <david@belohrad.ch>) id 1YC3YA-0001w4-O2
	for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 04:50:43 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <david@belohrad.ch>) id 1YC3Y5-00076A-7W
	for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 04:50:42 -0500
Original-Received: from beesknees.cern.ch ([137.138.197.99]:60667)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <david@belohrad.ch>) id 1YC3Y4-00075C-VR
	for help-gnu-emacs@gnu.org; Fri, 16 Jan 2015 04:50:37 -0500
Original-Received: from belohrad by beesknees.cern.ch with local (Exim 4.84)
	(envelope-from <david@belohrad.ch>)
	id 1YC3Y2-0002aQ-6B; Fri, 16 Jan 2015 10:50:34 +0100
User-Agent: Notmuch/0.18~rc0+2~gbc64cdc (http://notmuchmail.org) Emacs/24.4.1
	(x86_64-pc-linux-gnu)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 137.138.197.99
X-BeenThere: help-gnu-emacs@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Users list for the GNU Emacs text editor <help-gnu-emacs.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/help-gnu-emacs>
List-Post: <mailto:help-gnu-emacs@gnu.org>
List-Help: <mailto:help-gnu-emacs-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=subscribe>
Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.help:102111
Archived-At: <http://permalink.gmane.org/gmane.emacs.help/102111>

Dear all,

somebody can help? I'm using ediff with ORG files quite often. Usually
any writing into journal.org results in merge conflicts, which have to
be resolved manually.

Most of the time the resolve involves joining the bufferA and bufferB
into the bufferC. For the moment what I do is, that I use 'a' or 'b'
keystroke to make one of those buffers copied into bufferC, and _then
manually_ copy the content of the other buffer into the bufferC.

Is there any way how in ediff join the differences of each buffer wrt
ancestor and apply those on bufferC?

many thanks
david