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 behavi
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 t
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
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)
> (use "git checkout --
What Operating System are you on (version etc) and which Git version.
If you are on Windows (and perhaps Mac), do check the file name casing
(upper/lower) as both ignore case but preserve it.
Other options are that you have a line ending setting that does not 'round
trip' properly, so maybe LF
