From: Phillip Lord <p.lord@russet.org.uk>
Subject: Re: PCL-CVS, How To Merge?
Date: 19 Jun 2003 10:46:02 +0100 [thread overview]
Message-ID: <vf3ci6xuw5.fsf@rpc71.cs.man.ac.uk> (raw)
In-Reply-To: uisr2zuwm.fsf@standardandpoors.com
>>>>> "Galen" == Galen Boyer <galenboyer@hotpop.com> writes:
Galen> Point is on line saying need-merge. What is the command to
Galen> make this happen? Whenever I hit `d E' on either a marked or
Galen> unmarked line, I get the message:
Galen> `merge' is not applicable to any of the selected files.
Galen> -- Galen Boyer
You use "update", which is somewhat confusingly bound to "O". This
will result either in "merge" changing to "modified"; that is the
changes in the repository have been added to your version without
problems, or "conflict" which means CVS can't work it out, in which
case you use `vc-resolve-conflicts' on the buffer, which gives you
ediff, and lots of colours.
Phil
next prev parent reply other threads:[~2003-06-19 9:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-06-19 2:05 PCL-CVS, How To Merge? Galen Boyer
2003-06-19 9:46 ` Phillip Lord [this message]
2003-06-19 14:43 ` Stefan Monnier
2003-06-19 15:07 ` Galen Boyer
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vf3ci6xuw5.fsf@rpc71.cs.man.ac.uk \
--to=p.lord@russet.org.uk \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.