Masatake YAMATO <[EMAIL PROTECTED]> writes: > 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?
I'm using GNU Emacs from CVS (probably a couple of weeks old). I'll update HACKING shortly. > smerge-mode.el in GNU Emacs in the CVS repository provides a great interface > for handle conflicts. [...] Cool.. I'll check this out. So far I've been dealing with conflicts using diff-mode, which works reasonably well. I just wanted to check that I wasn't overlooking a way to avoid these sort of merge conflicts completely. > I believe the popup menu is extremely useful even if you love keyboard. Heheh I do :o) I'll take a look at the popup menu, though. Thanks, Mark -- Mark Triggs <[EMAIL PROTECTED]>
