Re: [git-users] Git says there are local changes, but there are no changes. (Windows)

2016-03-12 Thread Ben Page
No, you do not. On Friday, March 11, 2016 at 1:55:27 AM UTC-6, tombert wrote: > > you need to do a "git checkout ." in order to overwrite local changes > (note the dot after the checkout command). > > On Friday, 4 March 2016 22:05:19 UTC+1, Ben Page wrote: >> >> The repos that exhibit this

Re: [git-users] Git says there are local changes, but there are no changes. (Windows)

2016-03-10 Thread tombert
you need to do a "git checkout ." in order to overwrite local changes (note the dot after the checkout command). On Friday, 4 March 2016 22:05:19 UTC+1, Ben Page wrote: > > The repos that exhibit this behavior are Visual Studio projects and the > problem files are text files. > > I don't think

Re: [git-users] Git says there are local changes, but there are no changes. (Windows)

2016-03-04 Thread Ben Page
The repos that exhibit this behavior are Visual Studio projects and the problem files are text files. I don't think the problem is line endings. git diff returns nothing and the projects have * text=auto in the .gitattributes file and core.autocrlf set to true. I believe the problem is caused

Re: [git-users] Git says there are local changes, but there are no changes. (Windows)

2016-02-24 Thread Dale R. Worley
Ben Page writes: >>git status > On branch master > Your branch is behind 'origin/master' by 2 commits, and can be > fast-forwarded. > (use "git pull" to update your local branch) > Changes not staged for commit: > (use "git add ..." to update what will be committed) >

Re: [git-users] Git says there are local changes, but there are no changes. (Windows)

2016-02-23 Thread Philip Oakley
- From: Ben Page To: Git for human beings Sent: Tuesday, February 23, 2016 6:34 PM Subject: [git-users] Git says there are local changes, but there are no changes. (Windows) I have a couple repos that routinely believe there are local changes, when there are none. The only solution seems

[git-users] Git says there are local changes, but there are no changes. (Windows)

2016-02-23 Thread Ben Page
I have a couple repos that routinely believe there are local changes, when there are none. The only solution seems to be to delete these files and reacquire them from git. For example: >git status On branch master Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.