git checkout master error: the following untracked working tree files would be overwritten by checkout
I have a git repository. It has A B C D E ... commits. Now I want to checkout D as a new branch named Dbranch. So I excute:git checkout D -b Dbranch. And now I want to delete this branch. Firstly I need to switch to master branch , and then use git branch -d Dbranch to delete it. But when I excute git checkout master, it gives me the error.
error: The following untracked working tree files would be overwritten by checkout:
source/a/foo.c
...... (too many lines)
Please move or remove them before you can switch branches.
Aborting
How to delete the Dbranch?
Try git checkout -f master.
-f or --force
Source: https://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes. When checking out paths from the index, do not fail upon unmerged entries; instead, unmerged entries are ignored.
With Git 2.23 (August 2019), that would be, using git switch -f:
git switch -f master
That avoids the confusion with git checkout (which deals with files or branches).
This command will proceed, even if the index or the working tree differs from HEAD.
Both the index and working tree are restored to match the switching target.
If --recurse-submodules is specified, submodule content is also restored to match the switching target.
This is used to throw away local changes.
do a :
git branch
if git show you something like :
* (no branch)
master
Dbranch
You have a "detached HEAD". If you have modify some files on this branch you, commit them, then return to master with
git checkout master
Now you should be able to delete the Dbranch.
Follow WeChat
Success story sharing
Want to stay one step ahead of the latest teleworks?
Subscribe Now相似问题
- How to remove local (untracked) files from the current Git working tree
- How can I selectively merge or pick changes from another branch in Git?
- .gitignore and "The following untracked working tree files would be overwritten by checkout"
- How can I reconcile detached HEAD with master/origin?
- Git push rejected after feature branch rebase
- Can I delete a git commit but keep the changes?
- Git merge hotfix branch into feature branch
- The following untracked working tree files would be overwritten by merge, but I don't care
git status -uwas displaying nothing...I had no idea how to delete this mysterious untracked file, but this command helped me circumvent that for now