From: Jeff King <peff@peff.net>
To: Yuri <yuri@rawbw.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: 'git pull' complains that a locally resurrected directory would be overwritten by merge when no pulled changes are affecting that directory
Date: Tue, 24 Aug 2021 21:05:13 -0400 [thread overview]
Message-ID: <YSWXSWiDWNU93lhC@coredump.intra.peff.net> (raw)
In-Reply-To: <01514401-78f6-3fdc-aa74-c519fb6ab427@rawbw.com>
On Tue, Aug 24, 2021 at 09:41:49AM -0700, Yuri wrote:
> In the FreeBSD ports repository I resurrected the directory (that was
> removed a long time ago) with the command:
>
> > $ git checkout {hash}~1 -- math/polymake
>
>
> I made local changes to this directory and called 'git add math/polymake'.
>
> Then 'git pull' complained:
>
> > $ git pull
> > error: Your local changes to the following files would be overwritten by
> merge:
> > math/polymake/Makefile math/polymake/distinfo
> math/polymake/files/patch-Makefile
> math/polymake/files/patch-support_install.pl math/polymake/pkg-descr
> math/polymake/pkg-plist
>
>
> No incoming changes affect math/polymake. Nobody has created this directory
> simultaneously with me. There is no intersection with incoming changes.
>
>
> Why does 'git pull' complain then?
It's hard to say without seeing a full example. The merge machinery is
supposed to handle this situation (and indeed, in a simple reproduction
example it does). So presumably it thinks the other side may have
touched those files for some reason. Perhaps it's confused by rename
detection?
Is it possible to give us a more complete example, including:
- a url for the repository
- the commit at HEAD when you ran "git checkout"
- the {hash} commit from which you rescued the files
- the state of the remote branch (i.e., what we attempted to merge
with "git pull")
?
-Peff
next prev parent reply other threads:[~2021-08-25 1:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 16:41 'git pull' complains that a locally resurrected directory would be overwritten by merge when no pulled changes are affecting that directory Yuri
2021-08-25 1:05 ` Jeff King [this message]
2021-08-25 15:42 ` Elijah Newren
2021-08-25 19:05 ` Jeff King
2021-08-25 21:19 ` Junio C Hamano
2021-08-27 1:05 ` Jeff King
2021-08-28 5:21 ` Elijah Newren
2021-08-25 5:43 ` Bagas Sanjaya
2021-08-25 5:47 ` Yuri
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=YSWXSWiDWNU93lhC@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=yuri@rawbw.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).