From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.5 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id B98FB1F8C6 for ; Wed, 25 Aug 2021 05:47:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232445AbhHYFsA (ORCPT ); Wed, 25 Aug 2021 01:48:00 -0400 Received: from shell1.rawbw.com ([198.144.192.42]:44228 "EHLO shell1.rawbw.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232420AbhHYFsA (ORCPT ); Wed, 25 Aug 2021 01:48:00 -0400 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 17P5lE8g052488 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 24 Aug 2021 22:47:14 -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 Subject: Re: 'git pull' complains that a locally resurrected directory would be overwritten by merge when no pulled changes are affecting that directory To: Bagas Sanjaya , Git Mailing List References: <01514401-78f6-3fdc-aa74-c519fb6ab427@rawbw.com> <2fe5e6c2-3887-6d7d-7240-2aa9f0e70873@gmail.com> From: Yuri Message-ID: Date: Tue, 24 Aug 2021 22:47:12 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <2fe5e6c2-3887-6d7d-7240-2aa9f0e70873@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 8/24/21 10:43 PM, Bagas Sanjaya wrote: > Have you committed or stashed such changes? No, they were uncommitted and unstashed. Yuri