From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: sverre@rabbelier.nl,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
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 23:35:30 -0700 [thread overview]
Message-ID: <7viqupkxjh.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080729050845.GE26997@sigill.intra.peff.net> (Jeff King's message of "Tue, 29 Jul 2008 01:08:45 -0400")
Jeff King <peff@peff.net> writes:
> Your reason was "it keeps your crap in the history". And while I
> generally am in favor of getting rid of crap and keeping a clean
> history, I think it is very much dependent on the individual project's
> preferences. IOW, that history might not contain "crap" but rather
> now-obsolete changes that are of historical interest.
>
> But I do agree that -Xtheirs is crap. ;)
Yes, that is why I did not merge 'master' with "theirs" merge into it to
subsume it. I reverted -Xtheirs from 'next' (due to "never-rewind during
the cycle" rule) and intend to rebuild 'next' without it when 1.6.0 ships.
However, that does not keep me from holding onto its tip privately (and I
do, as the machinery to pass -Xoption through git-merge to backends would
be useful later).
IOW, "now-obsolete changes that are of historical interest" does not
necessarily justify a "subsuming" merge using "-s ours" or "-s theirs".
prev parent reply other threads:[~2008-07-29 6:36 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
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 [this message]
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=7viqupkxjh.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.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.
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).