After IDEA edit properties file, submit git Chinese garbled

The problem is this

　　Git clone project from the code, and then use IDEA develop locally, properties files encoded using utf8 IDEA set format;

　　Open the properties file, did not see the garbage, and then edit the properties file, and then find all the properties of the Chinese become garbled when git diff.

　　So I would IDEA to change the encoding properties of the ASCII encoding and GBK encoding, to no avail.

 

Solutions

　　Ask your colleagues to see what my colleagues are encoded, then you use what configuration, all with utf8 is not necessarily correct.

　　Sometimes the need to configure is the best configuration.