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

[kazurayam]

@B_L

Is that the time stamp which is a comment at the top keeps changing everyday. This is causing a merge conflict…would ignoring this in git cause an issue?

I think it is harmless. I think that the settings directory is intentended TO BE IGNORED by Git.

Why do I think so? What is my reason to be confident? Please have a look at the following issue.

Why changes of <lastRun> info in a *.ts file conflict --- how to prevent it

I have made a demo project on GitHub for this issue https: //github.com/kazurayam/GitConflictsOfLastRunInTsPrevented Problem to solve When you create a Test Suite Test Suite/TS1 in a Katalon Studio project, Katalon Stuido will make <projectDir>/Test Suites/TS1.ts file. Content of the file will look like, for example, as follows: <?xml version="1.0" encoding="UTF-8"?> <TestSuiteEntity> <description></description> <name>TS1</name> <tag></tag> <isRerun>false</isRerun> <lastR…

In Dec 2018 I experienced Merge conflicts. I investigated it and proposed a fix to Katalon Team. They took my points and changed Katalon Studio a bit. They introduced the settings directory where timestamp-sort of ‘changing every time test runs’ data is stored, and these data are intended to be ignored, I believe.

---

@Katalon team,

I would like you to state that the settings directory should be .gitignored.