Are you looking for a way to work arround ？
Why changes of <lastRun> info in a *.ts file conflict --- how to prevent it proposed a tentative workaround to avoid merge conflicts using the .gitattribute file with the clean and the smudge filters. You may find it interesting.