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

You have already added/committed some files under the settings/ directory to your git repository, and you then add them to your .gitignore; these files will still be present in your repository index. You need to remove the settings/* files out of the index. In the project directory, do this:

$ git rm -r --cached settings/

For you interest, see

2 Likes

hello @kazurayam and @automation1
I agree with automation1 comment as this is not harmless to remove it from git.

For example, I need to version the file com.katalon.plugin.report.properties in order to correctly configure plugins generation for jenkins and other member team folders correctly :

Content of “com.katalon.plugin.report.properties”
#Wed Oct 21 17:54:55 CEST 2020
generatePDF=false
generateHTML=true
generateCSV=false
generateJUnit=true

this is not the only file which contains important configuration :
com.katalon.katalon-studio-smart-xpath.properties, com.kms.katalon.execution.webui.properties, com.kms.katalon.integration.analytics.properties, …

For me, timestamp should be removed in order to be able to be git versionned without any merge conflicts

1 Like

I agree.

If you want the Katalon team to take this serious, then you should make a new post as Feature Request (or as a Bug Report if you like).

thanks for you answer.
new POST just created : Remove timestamps from .properties files in settings folder

Excellent… we use git as a wide team and this has been definitely a source of confusion and annoyance as people check files that should not; or overwrite files that were deemed necessary.

If this file (settings/internal/com.kms.katalon.composer.testcase.properties)
causes so much inconvinience, why don’t just include this file only in .gitignotre?

From reading this topic my undersatnding is that it could not possibly cause any issue ( unlike including the whole folder settings/)

And from reading Remove timestamps from .properties files in settings folder (created back in 2020), it would be much more realistic solution than hoping that Katalon do what they promise to do ( back in 2020) in the near future )

No reason not to do it. You can edit the .gitignore file so that include settings/internal/com.kms.katalon.composer.testcase.properties. If you do so, the problem will be solved for you.

1 Like