From: Jeff King <peff@peff.net>
To: Nick O'Leary <nick.oleary@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Unexpected git diff output during merge conflict
Date: Thu, 8 Feb 2018 06:25:08 -0500 [thread overview]
Message-ID: <20180208112508.GA3506@sigill.intra.peff.net> (raw)
In-Reply-To: <CAF=vhqdJ2fByjSVt37b34wQUFo5_tb7rHbCddsaCzdvKywSBdg@mail.gmail.com>
On Thu, Feb 08, 2018 at 10:51:57AM +0000, Nick O'Leary wrote:
> $ git diff README.md
> diff --cc README.md
> index 61d78b2,620d806..0000000
> --- a/README.md
> +++ b/README.md
> @@@ -1,7 -1,1 +1,11 @@@
> -This is my default readme
> ++<<<<<<< HEAD
> +merged-history-test
> +===================
> +
> +### About
> +
> +This is your project's README.md file. It helps users understand what your
> - project does, how to use it and anything else they may need to know.
> ++project does, how to use it and anything else they may need to know.
> ++=======
> ++This is my default readme
> ++>>>>>>> dev
>
> This does not look right to me. The 'This is my default readme' line
> has ++ at the start - suggesting its new to both parent copies of the
> file, which isn't the case - it came from the dev branch so should be
> prefixed with '+ '.
> I'm also not clear why the line beginning 'project does' has both a -
> and ++ prefix.
Are you sure there aren't whitespace differences in those two lines?
For instance, if I do:
# base commit
git init
git commit --allow-empty -m base
# one side; note missing newline!
printf 'this is my default readme' >file
git add file
git commit -m default
# other side
git checkout -b other HEAD^
{
echo this is a longer
echo and more involved
echo README
} >file
git add file
git commit -m longer
# and now merge and get a conflict
git merge master
Then I get similar output to you. The content with merge-conflicts
can't represent the original lack-of-newline for that file, because of
course there's another ">>>" line after it.
If I swap out the printf for echo, adding the newline, then it produces
the output you'd expect.
-Peff
next prev parent reply other threads:[~2018-02-08 11:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-08 10:51 Unexpected git diff output during merge conflict Nick O'Leary
2018-02-08 11:25 ` Jeff King [this message]
2018-02-08 11:50 ` Nick O'Leary
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=20180208112508.GA3506@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=nick.oleary@gmail.com \
/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).