EDCD / coriolis

Coriolis Shipyard for Elite Dangerous
https://coriolis.io
Other
262 stars 83 forks source link

Fix changed files issue (#3) #761

Closed alex-williams closed 6 months ago

alex-williams commented 6 months ago

Still not sure how the index of these files got corrupted in Git, but it wasn't crlf/line endings, it wasn't whitespace, or filemode, which are the usual culprits, these files simply had corrupted indexes and needed to be completely overwritten by multiple commits in sequence.

After merging into develop here on github, you will need to perform a git reset --hard origin/develop on your local copy whilst in the develop branch, this should cause the 'changed files' issue to go away permanently, if you create new branches from the develop branch going forward.