From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BE89C4338F for ; Tue, 24 Aug 2021 16:50:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E79116127B for ; Tue, 24 Aug 2021 16:50:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232927AbhHXQvc (ORCPT ); Tue, 24 Aug 2021 12:51:32 -0400 Received: from shell1.rawbw.com ([198.144.192.42]:12685 "EHLO shell1.rawbw.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232647AbhHXQva (ORCPT ); Tue, 24 Aug 2021 12:51:30 -0400 X-Greylist: delayed 534 seconds by postgrey-1.27 at vger.kernel.org; Tue, 24 Aug 2021 12:51:29 EDT Received: from yv.noip.me (c-73-189-35-76.hsd1.ca.comcast.net [73.189.35.76]) (authenticated bits=0) by shell1.rawbw.com (8.15.1/8.15.1) with ESMTPSA id 17OGfoK1064640 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO) for ; Tue, 24 Aug 2021 09:41:51 -0700 (PDT) (envelope-from yuri@rawbw.com) X-Authentication-Warning: shell1.rawbw.com: Host c-73-189-35-76.hsd1.ca.comcast.net [73.189.35.76] claimed to be yv.noip.me To: Git Mailing List From: Yuri Subject: 'git pull' complains that a locally resurrected directory would be overwritten by merge when no pulled changes are affecting that directory Message-ID: <01514401-78f6-3fdc-aa74-c519fb6ab427@rawbw.com> Date: Tue, 24 Aug 2021 09:41:49 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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? Yuri