Lots of new untracked files after merging with master?
See original GitHub issueTLDR: run git clean -xi
and remove all files that you didn’t create yourself, then re-install, or use snippet below.
If you’re contributing a PR and you recently merged upstream/master, you should see a lot untracked files when running git status
.
This is normal: these files were previously automatically generated and added to the .gitignore
. They have now been taken out of the gitignore (https://github.com/scikit-learn/scikit-learn/pull/17132) and can be safely removed.
To remove them, you can use git clean -xi
. This will also remove installation files like .so, dll or .c files, so you’ll finally need to re-install scikit-learn by running e.g. pip install -e .
or make in
.
Issue Analytics
- State:
- Created 3 years ago
- Comments:5 (4 by maintainers)
Top Results From Across the Web
git - The following untracked working tree files would be ...
The problem is when we have incoming changes that will merge untracked file, git complains. These commands helped me: git clean -dxf git...
Read more >git pull error: The following untracked working tree files would ...
Pulling a new master ends with the following error: $ git pull error: The ... untracked working tree files would be overwritten by...
Read more >Working Tree Files Would Be Overwritten by Merge
The error: the following untracked working tree files would be overwritten by merge is triggered when we are trying to pull a remote...
Read more >How do I force git pull to overwrite local files? - Tower Git Client
Please be careful with these commands: discarding local changes and untracked files cannot be undone! Step 2: Pull Again. After you have cleaned...
Read more >How to git clean untracked files example - TheServerSide.com
This article is on the 'git clean' command, which is used to delete untracked files from the local working tree.
Read more >Top Related Medium Post
No results found
Top Related StackOverflow Question
No results found
Troubleshoot Live Code
Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start FreeTop Related Reddit Thread
No results found
Top Related Hackernoon Post
No results found
Top Related Tweet
No results found
Top Related Dev.to Post
No results found
Top Related Hashnode Post
No results found
Top GitHub Comments
Alternatively you can also copy/paste this if you’re on a unix system:
You shouldn’t need to re-install
It’s been a while, this is probably not relevant anymore so I’ll close and unpin the issue