From: Junio C Hamano <gitster@pobox.com>
To: "Constantine Plotnikov" <constantine.plotnikov@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Alex Riesen <raa.lkml@gmail.com>
Subject: Re: Move-delete merge conflict is not displayed using git ls-files --unmerged
Date: Mon, 22 Dec 2008 12:48:09 -0800 [thread overview]
Message-ID: <7v4p0whr7a.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <85647ef50812220629o46134a70waf159bb6cd6d6e72@mail.gmail.com> (Constantine Plotnikov's message of "Mon, 22 Dec 2008 17:29:02 +0300")
"Constantine Plotnikov" <constantine.plotnikov@gmail.com> writes:
> I think that if git merge reports the conflicts, such conflicts should
> be discoverable using git ls-files and prevent commit with resolving
> the conflict like it is done with modify-delete conflicts.
Yeah, I think so, too.
next prev parent reply other threads:[~2008-12-22 20:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-22 14:29 Move-delete merge conflict is not displayed using git ls-files --unmerged Constantine Plotnikov
2008-12-22 20:48 ` Junio C Hamano [this message]
2008-12-22 22:10 ` [PATCH] merge-recursive: mark rename/delete conflict as unmerged Johannes Schindelin
2008-12-22 23:12 ` Junio C Hamano
2008-12-23 16:20 ` Johannes Schindelin
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=7v4p0whr7a.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=constantine.plotnikov@gmail.com \
--cc=git@vger.kernel.org \
--cc=raa.lkml@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.
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 NNTP newsgroup(s).