[oe-users] merging files?

[Justin Patrin]

On 8/16/07, Joe Pfeiffer <joseph at pfeifferfamily.net> wrote:
> Trying to do an
>
> mtn update
>
> the system has come across a locally modified file with a change that
> conflics with upstream (I know, I need to get it submitted).  It
> brings up an emacs ediff session, giving me the opportunity to resolve
> the conflict.  So far, so good -- I've been able to get to the patch
> hunk, make one of the originals authoritative, and manually edit the
> buffer from there.  Now, how do I apply the result?
>
> I can see how to make it look like a patch file, but not how to apply
> the resulting patch.  I can see how to make it look like I want the
> combination to look, but not how to save the resulting file (except in
> its /tmp file, of course).
>
> I've been using emacs for a long, long time, but this is the first
> time I've come across ediff.
>
> Any help wold be appreciated...
>

Save it to the /tmp file and mtn will put it where it needs to be. You
should be able to C-x, C-c and just hit "Yes" to save it and it should
work.

-- 
Justin Patrin