From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: sverre@rabbelier.nl, 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: Tue, 29 Jul 2008 01:27:44 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.1.00.0807290123300.2725@eeepc-johanness> (raw)
In-Reply-To: <20080728192651.GA26677@sigill.intra.peff.net>
Hi,
On Mon, 28 Jul 2008, Jeff King wrote:
> On Mon, Jul 28, 2008 at 08:09:55PM +0100, Johannes Schindelin 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".
> >
> > I would have expected the one who has the good version to make the
> > choice.
>
> My situation was two long-running branches, "stable" and "devel", both
> of which were worked on by many developers. One person was in charge of
> integration and branch management. They wanted "stable" to get the
> contents of "devel" (which were now ready for release), ignoring any
> small fixes that had been done on "stable" (since they had all been
> moved over to "devel" previously, but in subtly different ways that
> would create conflicts). And "git reset" was not an option, because they
> wanted to keep the history of "stable" in case those fixes needed to be
> looked at later.
>
> So the logical sequence was:
>
> git checkout production
> git merge -s theirs master
To me, this suggests that they were too married to 'production' being the
"dominant" branch.
Thing is: they had two branches. They should be merged, but one should
prevail: 'master'.
So if I have two branches, say "x" and "y", and I want to merge them, but
really throw away the tree of "x", I would check out 'y', naturally. Then
'git merge -s ours x'.
If the result should become the state of 'x', too, I would then just
'git push origin y:x'.
Maybe I am "Git-braindead" by now, so that you can make fun of me like I
used to make fun of CVSers and SVNers...
Ciao,
Dscho
next prev parent reply other threads:[~2008-07-28 23:27 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 [this message]
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
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=alpine.DEB.1.00.0807290123300.2725@eeepc-johanness \
--to=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).