Commits from different machines cause conflicts in Git

[kazurayam]

I wrote this:

• Why changes of info in *.ts conflict — how to prevent it

In this post, I described why conflicts occurs, and how to prevent the conflict.
Please have a look.