* CVS merge
@ 2007-04-24 10:30 rocher
2007-04-24 10:33 ` Johan Bockgård
2007-04-24 11:23 ` Kai Grossjohann
0 siblings, 2 replies; 3+ messages in thread
From: rocher @ 2007-04-24 10:30 UTC (permalink / raw)
To: help-gnu-emacs
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: CVS merge
2007-04-24 10:30 CVS merge rocher
@ 2007-04-24 10:33 ` Johan Bockgård
2007-04-24 11:23 ` Kai Grossjohann
1 sibling, 0 replies; 3+ messages in thread
From: Johan Bockgård @ 2007-04-24 10:33 UTC (permalink / raw)
To: help-gnu-emacs
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: CVS merge
2007-04-24 10:30 CVS merge rocher
2007-04-24 10:33 ` Johan Bockgård
@ 2007-04-24 11:23 ` Kai Grossjohann
1 sibling, 0 replies; 3+ messages in thread
From: Kai Grossjohann @ 2007-04-24 11:23 UTC (permalink / raw)
To: help-gnu-emacs
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-04-24 11:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-24 10:30 CVS merge rocher
2007-04-24 10:33 ` Johan Bockgård
2007-04-24 11:23 ` Kai Grossjohann
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).