From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Wed, 25 Aug 2021 05:43:13 GMT
Subject: Re: 'git pull' complains that a locally resurrected directory would be overwritten by merge when no pulled changes are affecting that directory
Message-ID: <2fe5e6c2-3887-6d7d-7240-2aa9f0e70873@gmail.com>
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