On 07/23/2016 06:30 PM, Guillaume Munch wrote:
> Le 26/06/2016 à 01:21, Scott Kostyshak a écrit :
>> I think this is due to the recent fixes in .gitattributes. In any case,
>> git reset --hard does not fix anything. But the following does work for
>> me:
>>
>> git rm .gitattributes
>> git add -A
>> git reset --hard
>>
>
> Thank you very much for this message. I have been needing this quite
> often since the problem has been fixed, typically after checking out
> older commits, so much that I needed to star it in my e-mail client.
>
> But, I have noticed untracked files disappearing from my directories
> (one of these files was ironically a script that automated the above
> lines...), so I wonder whether it is safe. If not, then I would be happy
> to know whether there is a safer solution.
>
> Since it looks so severe, I wonder whether there is a radical solution,
> such as rewriting the history of master, provided developers agree that
> the problem is that annoying.
That sounds dangerous.
I wonder if
git rm .gitattributes
git add .gitattributes
git reset --hard
would be enough.
Richard
