CODEWITHSUNDEEP
gitgit-checkout
Praveen Sripati
Praveen Sripati

Reputation: 33495

Why does 'git checkout' work only for some branches?

Here is the result of two checkouts: why the second is failing? 'git status' shows some files have been modified, but I am sure I haven't touched those files.

praveensripati@MyMini:~/Hadoop/Git/hadoop-common$ git checkout branch-0.21  
Switched to branch 'branch-0.21'  

praveensripati@MyMini:~/Hadoop/Git/hadoop-common$ git checkout branch-0.20  
error: The following untracked working tree files would be overwritten by checkout:  
    CHANGES.txt  
    LICENSE.txt  
    README.txt  
    bin/hadoop  
    bin/hadoop-daemon.sh  
    bin/hadoop-daemons.sh  
Please move or remove them before you can switch branches.  
Aborting

praveensripati@MyMini:~/Hadoop/Git/hadoop-common$ git status
# On branch trunk
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#   CHANGES.txt
#   LICENSE.txt
#   README.txt
#   bin/
#   build.xml
#   conf/
#   lib/
#   site/
#   src/
nothing added to commit but untracked files present (use "git add" to track)

Upvotes: 4

Views: 822

Answers (3)

andygavin
andygavin

Reputation: 2884

This is occurring because some or all of the files that are not being tracked on your current branch are being tracked by the branch you want to change to.

For example the branch may contain a CHANGES.txt. Because git does not want to overwrite the file you have in your workspace if is giving your this error to allow you to backup the files you have locally. You can either:

  1. Move these files somewhere safe
  2. If you are sure you don't need these files, you can perform a checkout -f to switch to the branch (this will overwrite any files that conflict)

Stashing does not work for files that are not tracked on the current branch. You can use git diff to work out which files are on the 0.20 but not on 0.21. For example:

git diff --name-only branch-0.20

Upvotes: 5

Kit Ho
Kit Ho

Reputation: 26958

git stash 
git checkout branch-0.20
git stash apply

try above

Upvotes: 0

VonC
VonC

Reputation: 1323065

That can happen if there is a filter in place, automatically changing the content of those files on checkout. As in:

core.autocrlf=true

(See Why should I use core.autocrlf=true in Git?)

For instance, if the eol style is changed automatically, you would have modified files in your working tree.
And that would be enough to prevent another checkout with common modified files.

You can stash the changes, as Kit suggests, but I would recommend understanding first why those changes happen in the first place.

Upvotes: 3

Related Questions