Hi, Mark
> I've been keeping up to date with Matthieu's tree by star-merging in his
> changes from the *tla-bookmarks-missing* buffer. This is working really
> well, except that when I merge in a patch that contains changes from me
> and changes from someone else, I get a bunch of conflicts because my
> changes were already in my local tree.
Which version of emacs do you use?
(Please update
GNU Emacs, XEmacs and its version
=================================
We will support the both Emacs. The developers are
using:
Stefan Reichoer <[EMAIL PROTECTED]>: GNU Emacs 21.3.1, GNU Emacs in
CVS repository
Matthieu Moy <[EMAIL PROTECTED]>: GNU Emacs 21.2
Masatake YAMATO <[EMAIL PROTECTED]>: GNU Emacs in CVS repository
Milan Zamazal <[EMAIL PROTECTED]>: ???
Martin Pool <[EMAIL PROTECTED]>: ???
Robert Widhopf-Fenk <[EMAIL PROTECTED]>: ???
Mark Triggs <[EMAIL PROTECTED]>: ???)
smerge-mode.el in GNU Emacs in the CVS repository provides a great interface
for handle conflicts. As, Stefan proposed, set (setq tla-three-way-merge t) as
default. Then you will get conflict marks in files like:
<<<<<<< ChangeLog
2003-04-07 Masatake YAMATO <[EMAIL PROTECTED]>
* help.el (describe-minor-mode): New function implementation.
Accept both minor mode string and minor mode indicator.
(describe-minor-mode-completion-table-for-indicator)
(describe-minor-mode-completion-table-for-symbol): New functions.
(describe-minor-mode-from-symbol): renamed
from (old) describe-minor-mode. Use
describe-minor-mode-completion-table-for-symbol.
2003-04-08 Kenichi Handa <[EMAIL PROTECTED]>
=======
2003-04-10 Kenichi Handa <[EMAIL PROTECTED]>
* international/mule.el: Set
after-insert-file-adjust-coding-function to
after-insert-file-set-buffer-file-coding-system instead of adding
it to after-insert-file-functions.
* language/ind-util.el (indian-2-column-to-ucs-region): Fix for
the case of replacing multibyte characters.
>>>>>>> 1.5022
Move the mouse cursor onto the area where you want to kill or keep; and press
the mouse's right button. You will get popup menu like:
Keep Current
Kill Current
Keep ALL
The biggest problem is this functionality is not activated on
fundamental-mode, changelog-mode and text-mode.
In such case, do
M-x c-mode
M-x smerge-mode
.
I believe the popup menu is extremely useful even if you love keyboard.
