From: "norbert.nemec" <norbert.nemec@native-instruments.de>
To: git@vger.kernel.org
Subject: Re: How to find and analyze bad merges?
Date: Thu, 02 Feb 2012 10:01:18 +0100 [thread overview]
Message-ID: <jgdjd1$5mn$1@dough.gmane.org> (raw)
In-Reply-To: <7vd39xy7it.fsf@alter.siamese.dyndns.org>
Am 02.02.12 09:16, schrieb Junio C Hamano:
> "norbert.nemec"<norbert.nemec@native-instruments.de> writes:
>
>> a colleague of mine happened to produce a bad merge by unintenionally
>> picking the version of the remote branch ("R") for all conflicting
>> files. Effectively, he eliminated a whole bunch of bugfixes that were
>> already on his local branch ("L").
>>
>> Obviously this was a mistake on his side, but hey: everyone makes
>> mistakes. The real problem is to find this problem afterwards,
>> possibly weeks later, when you suddenly realize that a bug that you
>> had fixed suddenly reappears.
>
> Bisect?
This is not the point: My colleague knew exactly which commit contained
the bugfix. The trouble was finding out why this bugfix disappeared even
though everything indicated that it was cleanly merged into the current
branch.
next prev parent reply other threads:[~2012-02-02 9:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 8:10 How to find and analyze bad merges? norbert.nemec
2012-02-02 8:16 ` Junio C Hamano
2012-02-02 9:01 ` norbert.nemec [this message]
2012-02-02 20:09 ` Junio C Hamano
2012-02-02 10:05 ` norbert.nemec
[not found] ` <87haz97c2k.fsf@thomas.inf.ethz.ch>
2012-02-02 11:17 ` Norbert Nemec
2012-02-02 11:41 ` David Barr
2012-02-02 12:03 ` Jonathan Nieder
2012-02-02 12:16 ` norbert.nemec
2012-02-02 15:09 ` Neal Groothuis
2012-02-02 12:10 ` norbert.nemec
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='jgdjd1$5mn$1@dough.gmane.org' \
--to=norbert.nemec@native-instruments.de \
--cc=git@vger.kernel.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).