Re: PCL-CVS, How To Merge?

[Galen Boyer]

On 19 Jun 2003, p.lord@russet.org.uk wrote:
>>>>>> "Galen" == Galen Boyer <galenboyer@hotpop.com> writes:
> 
>   Galen> Point is on line saying need-merge.  What is the
>   Galen> command to make this happen?  Whenever I hit `d E' on
>   Galen> either a marked or unmarked line, I get the message:
> 
>   Galen>   `merge' is not applicable to any of the selected
>   Galen>   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.

Okay, I'll give that a try.

For the record (as most already know) PCL-CVS is a wonderful
package.  I am able to constantly have a very informative
conversation with CVS.

-- 
Galen Boyer