git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: 'git pull' complains that a locally resurrected directory would be overwritten by merge when no pulled changes are affecting that directory

From
YYuri <yuri@rawbw.com>
Date
Aug 25, 2021, 05:47 UTC
Message-ID
<acbc5ec8-fe21-3c8e-8f4f-e3be3126c2ed@rawbw.com>
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
Previous: Bagas Sanjaya
Message 9 of 9 in “'git pull' complains that a locally resurrected directory would be overwritten by merge when no pulled changes are affecting that directory”
  1. YuriAug 24, 2021
  2. Jeff KingAug 25, 2021
  3. Elijah NewrenAug 25, 2021
  4. Jeff KingAug 25, 2021
  5. Junio C HamanoAug 25, 2021
  6. Jeff KingAug 27, 2021
  7. Elijah NewrenAug 28, 2021
  8. Bagas SanjayaAug 25, 2021
  9. YuriAug 25, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.