From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Josh Bleecher Snyder <josharian@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge-tree: bug report and some feature requests
Date: Sun, 21 Jan 2018 09:14:36 +0100 [thread overview]
Message-ID: <87607viq6r.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <CAFAcib-2fxiVxtVWcbvafY3-Br7Y70HMiHFZoT0VfK6JU0Dp9A@mail.gmail.com>
On Sun, Jan 21 2018, Josh Bleecher Snyder jotted:
> 3. Feature suggestion
>
> There's no direct indication of whether any given file's merge
> succeeded. Currently I sniff for merge conflicts by looking for
> "+<<<<<<< .our", which feels like an ugly kludge. Could we provide an
> explicit indicator? (And maybe also one for binary vs text
> processing?)
>
> Note that binary file merge conflicts don't generate patches with
> three-way merge markers but instead say "warning: Cannot merge binary
> files: binary (.our vs. .their)". Looking for this case even further
> complicates the output parser.
I thought I had a way to do this, but looking back in my logs I find
that I was just using:
git merge-tree $(git merge-base A B) A B | grep -e '^\+======='; echo $?
I.e. a variation of what you're doing, which as you note won't work for
binary files.
next prev parent reply other threads:[~2018-01-21 8:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-21 3:00 git merge-tree: bug report and some feature requests Josh Bleecher Snyder
2018-01-21 8:14 ` Ævar Arnfjörð Bjarmason [this message]
2018-01-22 17:58 ` Elijah Newren
2018-01-23 7:08 ` Josh Bleecher Snyder
2018-01-23 11:52 ` Edward Thomson
2018-01-24 18:46 ` Josh Bleecher Snyder
2018-01-24 19:39 ` Elijah Newren
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=87607viq6r.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=josharian@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).