D
D
DancingOnWater2014-04-29 14:45:38
git
DancingOnWater, 2014-04-29 14:45:38

Git incorrectly marked a file as binary - what to do?

There is a repository under svn, I have git on my machine, communicating with the repository through git svn. At some point, trouble happened: git mistakenly marked one of the files as binary. A quick google found the problem - the file encoding turned out to be UTF-16, now the file is UTF-8 and was uploaded via tortoise-svn to the trunk, but git still considers it binary.
Does anyone have any suggestions on how to get out of this situation?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
D
DancingOnWater, 2014-04-29
@DancingOnWater

The option helped: delete from the cache - commit - add -commit. After that, git ceases to perceive it as binary and, moreover, continues to consider it as text, if you do git reset HEAD~2 and kill both fake commits

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question