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

Need pull to delete files.

From
RSRussell, Scott <scott.russell2@ncr.com>
Date
Aug 24, 2021, 13:09 UTC
Message-ID
<BN6PR15MB1426E3B4145523DB98774C56CBC59@BN6PR15MB1426.namprd15.prod.outlook.com>
Yesterday, when running get pull, I got the message.  
Stopping, untracked file in the working tree would be overwritten by the merge.   Please delete fileX before continuing merge.

As part of our regular process, we are continually deleting files. We will have: File1 File2.

Then we will add File3 And delete File1. 

We do not want to get a message saying untracked file ...   If the file is untracked, then why is git checking it?

During pull ( for build ) we need the pull to delete the deleted file. Using -ff did not work. On our build machine, the remote ( github ) is the master. Local working tree is expendable. We want to always pull and merge the remote regardless. 

Thanks, 
Scott Russell
Staff SW Engineer 
NCR Corporation 
Phone: +17706237512
Scott.Russell2@ncr.com  |  ncr.com
Message 1 of 1 in “Need pull to delete files.”
  1. Russell, ScottAug 24, 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.