CVS merge

CVS merge

[rocher]

Hi,

After a CVS merge with a command like 'cvs update -kk -j HEAD', files
with conflicts have regions like this:

<<<<<<< file.cpp
   local version
=======
   newer version
>>>>>>> file.cpp (cvs-version)

Is there a way in Emacs to automatically select one of these regions
and to remove the other?


Bye,
---
Francesc Rocher

Re: CVS merge

[Johan Bockgård]

rocher <francesc.rocher@gmail.com> writes:

> After a CVS merge with a command like 'cvs update -kk -j HEAD', files
> with conflicts have regions like this:
>
> <<<<<<< file.cpp
>    local version
> =======
>    newer version
>>>>>>>> file.cpp (cvs-version)
>
> Is there a way in Emacs to automatically select one of these regions
> and to remove the other?

M-x vc-resolve-conflicts

-- 
Johan Bockgård

Re: CVS merge

[Kai Grossjohann]

rocher <francesc.rocher@gmail.com> writes:

> Is there a way in Emacs to automatically select one of these regions
> [produced by "cvs update" when there are conflicts] and to remove
> the other?

M-x smerge-mode RET

That does not automatically select regions but provides convenient
keybindings to navigate between conflicts and to choose the A or B
variant.

Another possibility is to type d E on the file in the buffer produced
by M-x cvs-update RET.  That gives you the same functionality with a
different UI.

Kai