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

pull failed - why should I receive this message.

From
RSRussell, Scott <scott.russell2@ncr.com>
Date
Sep 24, 2021, 14:48 UTC
Message-ID
<BN6PR15MB1426A342CBA9D993C0C49E55CBA49@BN6PR15MB1426.namprd15.prod.outlook.com>

Files not previously in git were added to git. Why should I have to manually delete them? Why can git put not replace them? They were untracked files that are now tracked and so the git copy is desired. We can't always know ahead of time what files may have been added elsewhere. We need the pull to work automatically.

error: The following untracked working tree files would be overwritten by merge:
        Staging/CADDApps/CADDUIHelper/Source/Release/CADDUIHelper.exe
        Staging/CADDApps/CADDUIHelper/Source/Release_Unicode/CADDUIHelper.exe
        Staging/CADDApps/InstallDriversPackage/Release/InstallDriversPackage.exe
        Staging/Common/NCRCommonCCLib/Source/Release/NCRCommonCCLibMsg.dll
        Staging/Devices/NFC/Elatec_RFIDReader/Bin/Director.exe
        Staging/Devices/NFC/Elatec_RFIDReader/Firmware/AppBlaster.exe
        Staging/Devices/NFC/Elatec_RFIDReader/Firmware/flash.exe
        Staging/Utilities64/SSPSWDriverInstaller/Bin/DIFxAPI.dll
        Staging/Utilities64/SSPSWDriverInstaller/Bin/DriverForge.v4.5.4.exe
        Staging/Utilities64/SSPSWDriverInstaller/Source/Release/SSPSWDriverInstaller.exe
        Staging/Utilities64/SSPSWDriverInstaller/Source/Release/SSPSWDriverInstallerMsg.dll
        Staging/Utilities64/SSPSWTaskMgr/Source/Release/SSPSWTaskMgr.exe
Please move or remove them before you merge.
Aborting
Updating e6f37b6878..02aa693031
Thanks, 
Scott Russell
Scott.Russell2@ncr.com  |  ncr.com
       
Next: Emily Shaffer
Message 1 of 11 in “pull failed - why should I receive this message.”
  1. Russell, ScottSep 24, 2021
  2. Emily ShafferSep 24, 2021
  3. Russell, ScottSep 24, 2021
  4. Randall S. BeckerSep 24, 2021
  5. Russell, ScottSep 24, 2021
  6. Emily ShafferSep 24, 2021
  7. Russell, ScottSep 24, 2021
  8. brian m. carlsonSep 24, 2021
  9. Russell, ScottSep 24, 2021
  10. brian m. carlsonSep 24, 2021
  11. Russell, ScottSep 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.