From: Yuri <yuri@rawbw.com>
To: Bagas Sanjaya <bagasdotme@gmail.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: Tue, 24 Aug 2021 22:47:12 -0700 [thread overview]
Message-ID: <acbc5ec8-fe21-3c8e-8f4f-e3be3126c2ed@rawbw.com> (raw)
In-Reply-To: <2fe5e6c2-3887-6d7d-7240-2aa9f0e70873@gmail.com>
On 8/24/21 10:43 PM, Bagas Sanjaya wrote:
> Have you committed or stashed such changes?
No, they were uncommitted and unstashed.
Yuri
prev parent reply other threads:[~2021-08-25 5:47 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
2021-08-25 5:47 ` Yuri [this message]
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=acbc5ec8-fe21-3c8e-8f4f-e3be3126c2ed@rawbw.com \
--to=yuri@rawbw.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
/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).