Re: What's in git.git

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mar 5, 2006, 10:15 UTC
Message-ID: <46a038f90603050215v7afcbd4crc145e85a4da416a7@mail.gmail.com>
In-Reply-To: <87irqtjjr1.fsf@wine.dyndns.org>

On 3/5/06, Alexandre Julliard <julliard@winehq.org> wrote:

Show 6 quoted lines

> You can use both. The VC backend is a per-file mode, that's handy when
> you are editing a file and want a quick diff/revert/commit of just
> that file; the commands are executed directly from the buffer
> containing the file. When making bigger changes, you should use the
> git-status mode (the one in git.el), which is a tree browser that
> gives you a view of the whole project.

So I should use a combination of both? Hmmm. Worth exploring, can you give us a quick guide on getting started with it? (Or where should I read? I'm not that good with emacs)...

Show 9 quoted lines

> > Can we get a new merge conflict mode that generates .rej files? Emacs
> > is superb at dealing with conflicts formatted that way. OTOH, it may
> > be able to deal smartly with diff3-style conflicts if it knows how to
> > talk with the VC backend -- I think the cvs mode can do that.
>
> What emacs mode do you use to resolve conflicts?  From the git-status
> buffer, if you edit a file with 'f' it will automatically turn on
> smerge mode if there are conflicts, or you can edit it in ediff merge
> mode with 'd E' like under pcl-cvs. Is that what you mean?

Oh. Ah. Ok! I'll have to try this! So far, I've had good luck following this guide:

    http://wiki.gnuarch.org/Process_20_2a_2erej_20files

which is targetted pretty much at dumb emacs users. Like me ;-)

martin