{"thread":{"id":"56366","subject":"Need pull to delete files.","startedAt":"2021-08-24T14:07:20Z","lastAt":"2021-08-24T14:07:20Z","messageCount":1,"participants":["Russell, Scott"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"433555","messageId":"BN6PR15MB1426E3B4145523DB98774C56CBC59@BN6PR15MB1426.namprd15.prod.outlook.com","threadId":"56366","inReplyTo":null,"subject":"Need pull to delete files.","fromName":"Russell, Scott","fromEmail":"scott.russell2@ncr.com","sentAt":"2021-08-24T13:09:45Z","receivedAt":"2021-08-24T14:07:20Z","isPatch":false,"sender":{"key":"scott.russell2@ncr.com","avatar":null},"body":"Yesterday, when running get pull, I got the message.  \n\nStopping, untracked file in the working tree would be overwritten by the merge.   Please delete fileX before continuing merge. \n\nAs part of our regular process, we are continually deleting files.   \nWe will have:\nFile1 \nFile2.  \n\nThen we will add \nFile3 \nAnd delete File1.  \n\nWe do not want to get a message saying untracked file ...   If the file is untracked, then why is git checking it? \n\nDuring pull ( for build ) we need the pull to delete the deleted file.   Using -ff did not work.  \nOn our build machine, the remote ( github ) is the master.   Local working tree is expendable.   We want to always pull and merge the remote regardless.  \n\n\nThanks, \n\nScott Russell\nStaff SW Engineer \nNCR Corporation \nPhone: +17706237512\nScott.Russell2@ncr.com  |  ncr.com\n       \n\n"}]}