Closed riptl closed 7 years ago
Sometimes, Git shows something like warning: Cannot merge binary files: GameData/FerramAerospaceResearch/Localization/Localization.cfg (HEAD vs. upstream/ksp_update)
warning: Cannot merge binary files: GameData/FerramAerospaceResearch/Localization/Localization.cfg (HEAD vs. upstream/ksp_update)
Which is problematic. This is a small fix that marks all files that end with .cfg as text files. It will make merging easier.
I am stupid
riptl
commented
7 years ago riptl
commented
7 years ago
Sometimes, Git shows something like
warning: Cannot merge binary files: GameData/FerramAerospaceResearch/Localization/Localization.cfg (HEAD vs. upstream/ksp_update)Which is problematic. This is a small fix that marks all files that end with .cfg as text files. It will make merging easier.