* Need pull to delete files.
@ 2021-08-24 13:09 Russell, Scott
0 siblings, 0 replies; only message in thread
From: Russell, Scott @ 2021-08-24 13:09 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-24 14:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24 13:09 Need pull to delete files Russell, Scott
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.