unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
From: Rasmus Pank Roulund <rasmus.pank@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: Ediff and merge
Date: Fri, 15 May 2009 21:34:23 +0200	[thread overview]
Message-ID: <87octuupmo.fsf@rasmus.WORKGROUP> (raw)

Hello,
I have a simple and probably simple question on ediff and merge.
I use SVN. Sometimes conflicts happens. I try to resolve them with
Ediff. I use the 3files mode and use "a" and "b" to select whatever I
want to keep.
However, what to I type to save buffer c and resolve the conflict? It
would be the next logic step but I just cannot find the correct key...
At the moment I do "wc" and save it in place of the conflicted file and
resolve the conflict manually in svn-staus (I use psvn).
I hope somebody can help me out. 
I have read the quick help and a more extended version.

Thanks,
Rasmus 





             reply	other threads:[~2009-05-15 19:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-15 19:34 Rasmus Pank Roulund [this message]
     [not found] <mailman.7223.1242416089.31690.help-gnu-emacs@gnu.org>
2009-05-16  4:30 ` Ediff and merge Giorgos Keramidas
2009-05-16 10:28   ` Rasmus Pank Roulund
     [not found]   ` <mailman.7259.1242469777.31690.help-gnu-emacs@gnu.org>
2009-05-17  4:30     ` Giorgos Keramidas

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.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87octuupmo.fsf@rasmus.WORKGROUP \
    --to=rasmus.pank@gmail.com \
    --cc=help-gnu-emacs@gnu.org \
    /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. 
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).