Re: How to find and analyze bad merges?
- From
- norbert.nemec <norbert.nemec@native-instruments.de>
- Date
- Feb 2, 2012, 12:10 UTC
- Message-ID
- <jgduf8$mm3$1@dough.gmane.org>
- In-Reply-To
- <CAFfmPPMc1V97OPHyrZp+p4YUek1c6fCncyj0s1YU9xjxQBCsDA@mail.gmail.com>
Am 02.02.12 12:41, schrieb David Barr:
Show 14 quoted lines
> On Thu, Feb 2, 2012 at 10:17 PM, Norbert Nemec > <norbert.nemec@native-instruments.de> wrote: >> To be yet more precise: >> >> My complaint is that you need this kind of sledge-hammer solutions to >> analyze the situation. I, as an semi-expert with git did manage to find the >> problem without even having to resort to bisect or manually redoing the >> merge. My complaint is about the perspective of the medium-experienced user >> who is completely puzzled by the fact that a >> "git log<filename>" silently skips the critical merge commit. > > Do the -c --cc or -m flags for git log help in this case? > They alter the way merge diffs are presented, as described under Diff Formatting > in the git-log(1) man page.
Indeed, these help somewhat. This way, the changes are not hidden, but instead lost in the multitude of trivially-resolved conflicts...