From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Yuri <yuri@rawbw.com>, 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: Wed, 25 Aug 2021 12:43:13 +0700 [thread overview]
Message-ID: <2fe5e6c2-3887-6d7d-7240-2aa9f0e70873@gmail.com> (raw)
In-Reply-To: <01514401-78f6-3fdc-aa74-c519fb6ab427@rawbw.com>
On 24/08/21 23.41, 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.
Have you committed or stashed such changes?
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2021-08-25 5:43 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
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 [this message]
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=2fe5e6c2-3887-6d7d-7240-2aa9f0e70873@gmail.com \
--to=bagasdotme@gmail.com \
--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).