From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 02 Feb 2012 08:16:42 GMT
Subject: Re: How to find and analyze bad merges?
Message-ID: <7vd39xy7it.fsf@alter.siamese.dyndns.org>
In-Reply-To: <jgdgcv$h8n$1@dough.gmane.org>

"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?