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 13:05:11 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.1.00.0807291301060.4631@eeepc-johanness> (raw)
In-Reply-To: <20080729043839.GC26997@sigill.intra.peff.net>
Hi,
On Tue, 29 Jul 2008, Jeff King wrote:
> On Tue, Jul 29, 2008 at 01:27:44AM +0200, Johannes Schindelin wrote:
>
> > > 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.
>
> Perhaps. But I see this as an operation on the production branch: "pull
> in master's changes, forgetting ours".
First of all, I cannot say how wrong it is to forget any changes in a
production branch without proper explanation. I.e. without a commit
message explaining _why_ the change was wrong to begin with.
It is messy at best, and I am happy that Git does not make that easy.
> In your workflow (git checkout master && git merge -s ours production &&
> git push origin master:production) we perform an operation on master,
> which doesn't seem as intuitive to me.
But why? Isn't the _content_ of "master" what we want?
> Not to mention that we might not _control_ master.
This is Git. We control all local branches.
> What about (and I think Sverre mentioned something like this
> previously):
>
> I forked the kernel and made some changes. Some of my changes got
> applied upstream. The others are now obsolete. Now I want to bring
> myself in sync with Linus, but I want to keep my history (either
> because the history is interesting to me, or because others are basing
> their work on it).
>
> Then your workflow, while still possible within the local repository,
> means you are munging the "linus" branch, which seems wrong. That branch
> is probably even just a tracking branch, which you would not want to
> build on, anyway.
No, this workflow almost _dictates_ a plain "pull" into your local branch.
The fact that a few commits were applied to upstream usually only means
that your merge succeeds trivially, since the merged branches contain the
_same_ changes.
Ciao,
Dscho
next prev parent reply other threads:[~2008-07-29 11:05 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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* 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.0807291301060.4631@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).