[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: pcl-cvs / vc workflow description desired.
From: |
Kai Großjohann |
Subject: |
Re: pcl-cvs / vc workflow description desired. |
Date: |
Fri, 07 Mar 2003 17:08:26 +0100 |
User-agent: |
Gnus/5.090016 (Oort Gnus v0.16) Emacs/21.3.50 (gnu/linux) |
Le Wang <lewang(at@)yahoo.com> writes:
> I'm trying to use pcl-cvs and/or vc with GNU Emacs, and not having a
> very good time with it. In pcl-cvs, I can do the normal stuff
> (update, commit, add, etc). But when I see the dreaded "need to
> merge" message, I have no idea what's going on. What do I do? It
> seems that it's very easy to screw up at this point. I press 'd'
> 'E', and get the message "Merge is not applicalbe to any of the
> selected files. But the line says "need to merge" right there. I
> fumble around and press some keys before I know it, it's all
> "up-to-date", of course the contents is crap and I've just erased
> someone else's work.
Ayee. "Needs merge" means that you need to run "cvs update".
The "d E" command is applicable for the "Conflict" case.
It is unfortunate that a command named "merge" does not apply for a
file that has "needs merge" on it.
What can we do? Maybe "d E" should be called resolve-conflict.
--
A preposition is not a good thing to end a sentence with.