From: Johannes Sixt <j.sixt@viscovery.net>
To: Kevin Ballard <kevin@inkling.com>
Cc: git list <git@vger.kernel.org>
Subject: Re: [BUG] Replacing dir with submodule causes weird issues with cherry-pick
Date: Wed, 16 Feb 2011 08:05:40 +0100 [thread overview]
Message-ID: <4D5B7744.7040409@viscovery.net> (raw)
In-Reply-To: <22F69B3E-600C-41AC-911D-B9808A3705E6@inkling.com>
Am 2/16/2011 0:19, schrieb Kevin Ballard:
> If I replace a directory in my project with a submodule, then later attempt to
> cherry-pick a commit that predates this change (but does not touch the directory),
> git always marks the submodule path as containing an created/deleted merge conflict.
Known breakage; t3030 tests for it. 7d82b06d talks about a file/directory
conflict, though.
-- Hannes
prev parent reply other threads:[~2011-02-16 7:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-15 23:19 [BUG] Replacing dir with submodule causes weird issues with cherry-pick Kevin Ballard
2011-02-16 7:05 ` Johannes Sixt [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D5B7744.7040409@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=kevin@inkling.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).