From: Petr Baudis <pasky@suse.cz>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: Fredrik Kuivinen <freku045@student.liu.se>,
Junio C Hamano <junkio@cox.net>, Jon Loeliger <jdl@freescale.com>,
git@vger.kernel.org
Subject: Re: Expected Behavior?
Date: Thu, 10 Nov 2005 20:34:30 +0100 [thread overview]
Message-ID: <20051110193430.GU30496@pasky.or.cz> (raw)
In-Reply-To: <46a038f90511091847t70567e50o2303f1dc7ada2464@mail.gmail.com>
Dear diary, on Thu, Nov 10, 2005 at 03:47:38AM CET, I got a letter
where Martin Langhoff <martin.langhoff@gmail.com> said that...
> On 11/10/05, Petr Baudis <pasky@suse.cz> wrote:
> > Yes. My longer plan is to use the strategy resolvers as well, but my
> > TODO list is big... And I don't perceive this as a critical thing (the
> > standard strategy seems to work well enough), although I would like to
> > see this before 1.0.
>
> Fair enough. If you can outline how the interaction between cg-merge
> and cg-commit are expected to work, I'll try and find some time for
> that.
Well, basically like right now ;-).
Merging is a two-stage process, where the two stages are isolated and
the latter does not interfere with the former. The former one is doing
the actual content merge, and that's what cg-merge does. The latter one
is recording the merge in history, and that's what cg-commit does.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
next prev parent reply other threads:[~2005-11-10 19:34 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-08 3:43 Expected Behavior? Jon Loeliger
2005-11-08 6:00 ` Junio C Hamano
2005-11-08 9:56 ` Petr Baudis
2005-11-10 4:41 ` merge-one-file: use common as base, instead of emptiness Junio C Hamano
2005-11-10 19:43 ` Petr Baudis
2005-11-10 20:30 ` Junio C Hamano
2005-11-10 20:35 ` Petr Baudis
2005-11-08 21:03 ` Expected Behavior? Fredrik Kuivinen
2005-11-08 21:41 ` Junio C Hamano
2005-11-08 22:53 ` Fredrik Kuivinen
2005-11-09 5:50 ` Junio C Hamano
2005-11-09 8:19 ` Fredrik Kuivinen
2005-11-09 10:42 ` [PATCH] merge-recursive: Fix support for branch names containing slashes Fredrik Kuivinen
2005-11-10 20:34 ` Expected Behavior? Petr Baudis
2005-11-10 22:52 ` Junio C Hamano
2005-11-10 23:22 ` Petr Baudis
2005-11-09 11:24 ` Petr Baudis
2005-11-09 23:04 ` Martin Langhoff
2005-11-09 23:12 ` Petr Baudis
2005-11-09 23:43 ` Martin Langhoff
2005-11-09 23:49 ` Petr Baudis
2005-11-10 2:47 ` Martin Langhoff
2005-11-10 19:34 ` Petr Baudis [this message]
2005-11-10 19:54 ` Martin Langhoff
2005-11-10 20:10 ` Petr Baudis
2005-11-09 23:36 ` Junio C Hamano
2005-11-09 23:42 ` Petr Baudis
2005-11-10 0:03 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2005-11-09 13:38 Jon Loeliger
2005-11-09 20:38 ` Junio C Hamano
2005-11-09 2:58 Jon Loeliger
2005-11-09 6:28 ` Junio C Hamano
2005-11-08 3:07 Jon Loeliger
2005-11-06 22:16 Jon Loeliger
2005-11-07 1:38 ` Junio C Hamano
2005-11-07 2:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051110193430.GU30496@pasky.or.cz \
--to=pasky@suse.cz \
--cc=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=jdl@freescale.com \
--cc=junkio@cox.net \
--cc=martin.langhoff@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).