Git Merge conflict com.kms.katalon.composer.testcase.properties

I would take your point.

Whether to write settings/ in the .gitignore file — it depends on each uses’ cases.

Once @devalex88 wrote

then we should check whether the .gitignore in the project template in 6.4.0 includes settings/ or not.