All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Spiegel <michael.m.spiegel@gmail.com>
To: git@vger.kernel.org
Subject: show all merge conflicts
Date: Fri, 27 Jan 2017 11:56:08 -0500	[thread overview]
Message-ID: <CANwu5-o=3p8QfWo9wQvok=UZESRVtF3Uxb3nEMZVv8AvkKYYGw@mail.gmail.com> (raw)

Hi folks,

I'm trying to determine whether a merge required a conflict to resolve
after the merge has occurred. The git book has some advice
(https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging) to use
`git show` on the merge commit or use `git log --cc -p -1`. These
strategies work when the merge conflict was resolved with a change
that is different from either parent. When the conflict is resolved
with a change that is the same as one of the parents, then these
commands are indistinguishable from a merge that did not conflict. Is
it possible to distinguish between a conflict-free merge and a merge
conflict that is resolved by with the changes from one the parents?

Thanks,
--Michael

             reply	other threads:[~2017-01-27 17:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-27 16:56 Michael Spiegel [this message]
2017-01-27 17:51 ` show all merge conflicts Jeff King
2017-01-28  5:42   ` G. Sylvie Davies
2017-01-28 13:43     ` Philip Oakley
2017-01-28 14:28     ` Jeff King
2017-01-29  6:45       ` G. Sylvie Davies
2017-02-27 14:28         ` Michael J Gruber
2017-02-27 19:45           ` Junio C Hamano
2017-02-27 20:45             ` Jeff King

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CANwu5-o=3p8QfWo9wQvok=UZESRVtF3Uxb3nEMZVv8AvkKYYGw@mail.gmail.com' \
    --to=michael.m.spiegel@gmail.com \
    --cc=git@vger.kernel.org \
    /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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.