From: "Sverre Rabbelier" <alturin@gmail.com>
To: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Cc: "Jeff King" <peff@peff.net>,
"Git Mailinglist" <git@vger.kernel.org>,
"Miklos Vajna" <vmiklos@frugalware.org>
Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Date: Mon, 28 Jul 2008 21:52:38 +0200 [thread overview]
Message-ID: <bd6139dc0807281252y650b9347md1d4ac788151d19f@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0807282008470.8986@racer>
On Mon, Jul 28, 2008 at 21:09, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> Well, I have to say that the workflow is a bit backwards if the person who
> _publishes_ the thing is the one saying "Ooops, my version no goodie,
> other version please, but so that pull still works".
Why so? In this case the other branch was also owned by the publishing
person. I don't quite follow how this is any stranger than ours?
(Which is stranger to me, why would you want to merge in a branch if
you're not going to do anything with it anyway? I'm sure there are
valid workflows for it, which is why we have it, just saying that I
think 'theirs' makes more sense to me than 'ours')
> I would have expected the one who has the good version to make the choice.
Why have the person with the good version merge with... a bad version?
Isn't it usually "I will merge with you, because I know your branch
makes things go twice as fast" (paraphrasing Linus from his git talk
at google).
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2008-07-28 19:53 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-28 14:54 theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy Sverre Rabbelier
2008-07-28 18:14 ` Miklos Vajna
2008-07-28 19:48 ` Sverre Rabbelier
2008-07-28 18:56 ` Jeff King
2008-07-28 19:09 ` Johannes Schindelin
2008-07-28 19:26 ` Jeff King
2008-07-28 20:00 ` Avery Pennarun
2008-07-28 23:27 ` Johannes Schindelin
2008-07-29 0:09 ` Sverre Rabbelier
2008-07-29 4:31 ` Jeff King
2008-07-29 4:38 ` Jeff King
2008-07-29 11:05 ` Johannes Schindelin
2008-07-29 12:36 ` Jeff King
2008-07-29 12:42 ` Sverre Rabbelier
2008-07-29 0:37 ` Junio C Hamano
2008-07-29 5:02 ` Jeff King
2008-07-29 9:36 ` Mike Ralphson
2008-07-29 12:42 ` Jeff King
2008-07-28 19:52 ` Sverre Rabbelier [this message]
2008-07-28 20:07 ` Junio C Hamano
2008-07-28 20:10 ` Sverre Rabbelier
2008-07-28 20:20 ` Junio C Hamano
2008-07-28 20:24 ` Sverre Rabbelier
2008-07-28 21:16 ` Junio C Hamano
2008-07-28 21:35 ` Junio C Hamano
2008-07-28 21:39 ` Sverre Rabbelier
2008-07-29 5:08 ` Jeff King
2008-07-29 6:35 ` 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=bd6139dc0807281252y650b9347md1d4ac788151d19f@mail.gmail.com \
--to=alturin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sverre@rabbelier.nl \
--cc=vmiklos@frugalware.org \
/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).