From: Thomas Rast <trast@student.ethz.ch>
To: Stefan Haller <lists@haller-berlin.de>
Cc: <git@vger.kernel.org>
Subject: Re: Confused about "degenerate" combined diff for merge commits
Date: Sun, 15 Aug 2010 21:54:57 +0200 [thread overview]
Message-ID: <201008152154.57578.trast@student.ethz.ch> (raw)
In-Reply-To: <1jna5yt.1pm42a3uw2yquM%lists@haller-berlin.de>
Stefan Haller wrote:
> However, for some of these merge commits I see diff output such as this:
>
> diff --cc Src/ClipBoard.cpp
> index 4357ea0,4357ea0..3fad79a
> --- a/Src/ClipBoard.cpp
> +++ b/Src/ClipBoard.cpp
> @@@ -71,7 -71,7 +71,7 @@@ AClipBoard* AClipBoard::SNew(
>
> AClipBoard* AClipBoard::SClipBoard()
> {
> -- static AClipBoard* spClipBoard = SNew();
> ++ static TPtr<AClipBoard> spClipBoard = SNew();
> return spClipBoard;
> }
>
> It looks like both merge parents had an identical diff here, so this is
> not a conflict; why does diff --cc even show this to me?
The --cc output has one column per parent, and if you removed all
other +/-/space columns, then (for that hunk) you'd have a unified
diff with that parent.
So I'd say the above means that both parents had
static AClipBoard* spClipBoard = SNew();
but your merge result was
static TPtr<AClipBoard> spClipBoard = SNew();
This is usually called an "evil merge" in git terms: it is introducing
changes that are neither coming from one side, nor part of a benign
merge resolution.
--
Thomas Rast
trast@{inf,student}.ethz.ch
prev parent reply other threads:[~2010-08-15 19:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-15 17:51 Confused about "degenerate" combined diff for merge commits Stefan Haller
2010-08-15 19:54 ` Thomas Rast [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=201008152154.57578.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=lists@haller-berlin.de \
/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).