git shows files have been changed?

Asked Aug 19 '16 at 19:59

Active Aug 19 '16 at 19:59

Viewed 70 times

After working in one of my branches in Visual Studio 2013 and then switching to another branch and then trying to switch back to another branch tfs/git is saying that I have 10 files that have changed, files that if you open them up and compare with unmodified, there aren't any lines that would indicate a change has been made. Both files are identical but tfs/git thinks there is some sort of change?

Anyone know why this might be happening?

asked Aug 19 '16 at 19:59

haakon.io

1

Tell me about your line endings. – Edward Thomson Aug 19 '16 at 20:04
@EdwardThomson - I have the default settings for line endings in VS. I'm seeing there are several plugins to help with this issue which I will try. – haakon.io Aug 19 '16 at 20:14
pick your last commit number and just do "git reset --hard ", that will reset your local source so you can just switch branches. – chrismillah Aug 21 '16 at 01:06
Which version of TFS are you using? Do your team member have the same issue? – Cece Dong - MSFT Aug 22 '16 at 07:42
1

Can you run git diff -R command to check the changes? Refer to the Update section in this question for reference: http://stackoverflow.com/questions/36647308/visual-studio-2015-git-cannot-pull-switch-because-there-are-uncommitted-changes – Eddie Chen - MSFT Aug 29 '16 at 09:42
@Eddie-MSFT - If I run that command I see 'LF will be replaced by CRLF in file foo.js' - Thanks for pointing out a useful command! :) – haakon.io Aug 29 '16 at 15:35
So you can fix your issue now? – Eddie Chen - MSFT Aug 30 '16 at 00:45

Switch to new branch in tfs/git without any changes, but tfs/git shows files have been changed?

0 Answers0