git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to find and analyze bad merges?

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 2, 2012, 08:16 UTC
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:
Show 9 quoted lines
> 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?
Previous: norbert.nemecNext: norbert.nemec
Message 2 of 11 in “How to find and analyze bad merges?”
  1. norbert.nemecFeb 2, 2012
  2. Junio C HamanoFeb 2, 2012
  3. norbert.nemecFeb 2, 2012
  4. Junio C HamanoFeb 2, 2012
  5. norbert.nemecFeb 2, 2012
  6. Norbert NemecFeb 2, 2012
  7. David BarrFeb 2, 2012
  8. Jonathan NiederFeb 2, 2012
  9. norbert.nemecFeb 2, 2012
  10. Neal GroothuisFeb 2, 2012
  11. norbert.nemecFeb 2, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.