All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Russell, Scott" <Scott.Russell2@ncr.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: pull failed - why should I receive this message.
Date: Fri, 24 Sep 2021 14:48:59 +0000	[thread overview]
Message-ID: <BN6PR15MB1426A342CBA9D993C0C49E55CBA49@BN6PR15MB1426.namprd15.prod.outlook.com> (raw)

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
       


             reply	other threads:[~2021-09-24 17:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-24 14:48 Russell, Scott [this message]
2021-09-24 17:28 ` pull failed - why should I receive this message Emily Shaffer
2021-09-24 17:34   ` Russell, Scott
2021-09-24 18:00     ` Randall S. Becker
2021-09-24 18:36       ` Russell, Scott
2021-09-24 18:39         ` Emily Shaffer
2021-09-24 18:52           ` Russell, Scott
2021-09-24 20:03         ` brian m. carlson
2021-09-24 20:13           ` Russell, Scott
2021-09-24 20:45             ` brian m. carlson
2021-09-24 20:49               ` Russell, Scott

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BN6PR15MB1426A342CBA9D993C0C49E55CBA49@BN6PR15MB1426.namprd15.prod.outlook.com \
    --to=scott.russell2@ncr.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.