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@xxxxxxx | ncr.com
