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

[B_L]

Ever since Katalon’s recent update to version 6.0.5 I can no longer merge our changes. We each have our own branch and will merge up into a master. However everytime a git merge is attempted we are now getting this error:

Auto-merging settings/internal/com.kms.katalon.composer.testcase.properties
CONFLICT (content): Merge conflict in settings/internal/com.kms.katalon.composer.testcase.properties

I have no idea how to resolve this…

[Kumar.Sushobhan]

$ git pull
remote: Counting objects: 8, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 5), reused 0 (delta 0)
Unpacking objects: 100% (8/8), done.
From https://codecloud.web.att.com/scm/st_nmic/automation_nmic
8aef845…b1276ed Development -> origin/Development
error: Your local changes to the following files would be overwritten by merge:
settings/internal/com.kms.katalon.composer.testcase.properties
Please commit your changes or stash them before you merge.
Aborting
Updating 26f4db5…b1276ed

Is this the error you getting ?

[B_L]

no like the above, here is a screenshot of git bash

[B_L]

Looks like the problem with “settings/internal/com.kms.katalon.composer.testcase.properties”
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?

Looks like this:

by force updating the first line I was able to merge again. If I ignore and the testCaseTag stuff changes, is this going to cause issues? I’m not sure when this file was added but I never had merge conflicts on this until the most recent version of katalon.

[zbeck008]

I have this same error. One thing you can do it right click and choose “Replace with HEAD Revision”. Then go ahead and commit. BUT, you dont get the latest timestamped version. That will only matter if you make a change like a P1,P2 label or something similar and you actually WANT that change in the settings. I am still waiting for a Katalon explanation. I would like it to simply disregard the datestamp as a valid change.

[kazurayam]

You should insert the following line into your .gitignore file:

settings/

And you want to remove the files under the settings directory out of the repository by

$ cd $projectDir
$ git rm -r --cached settings

Then you will have no more conflicts of the contents under the settings directory.

[B_L]

I was actually thinking about doing that, that is not gonna cause any issues is it? like do I need the other line from that file for any reason?

[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.

[zbeck008]

Im new to automation and have been using Katalon for only a few weeks. I’m not using any local Git repo and so Im not sure how to edit it by adding the settings/ comment you mentioned above. Is there a way through Katalon to do this? I would expect a right-click option to add it to the ignored files, but there isnt one.

[kazurayam]

zbeck008,

c/c @YoungNgo, @devalex88

@zbeck008

Im new to automation and have been using Katalon for only a few weeks. I’m not using any local Git repo and so Im not sure how to edit it by adding the settings/ comment you mentioned above. Is there a way through Katalon to do this? I would expect a right-click option to add it to the ignored files, but there isnt one.

Good question!

It may be surprising but Katalon Studio does NOT provide any means for you to edit .gitignore file located in the project directory. You have to use other text editor of your choice (Note pad, Atom, emacs, vim, etc).

[kazurayam]

I have ever posted some in this Forum asking Katalon Team to let me edit .gitigore and README.md files.

Want to edit .gitignore and README.md in Katalon Studio

Almost all of my Katalon Studio projects have .gitignore file and README.md file as the following screenshot shows. [Image: https://s3.amazonaws.com/katalon-forum/editor/c8/q97wvwwnfo2j.png] I put these two files because I save the project into GitHub. But I can not edit .gitignore and README.md with Katalon Studio. It’s a shame, I have to open another editor such as Emacs or Atom in order to edit README.md. I hope Katalon Studio enables me to edit README.md with markdown preview plugin such…

Eclipse Project Explorer tab in Katalon Studio

I want to edit .gitignore and README.md of a Katalon project in Katalon Studio. To accomplish this, I want to open an Eclipse Project Explorer in Katalon Studio as the following image shows: [ProjectExplorerInKatalonStudio] Project Explorer can be graded “for Geeks only”. Each project settings would have an option to enable/disable this. The default would be “disabled”. How do you like it? Terrible idea?

Katalon team listed this requirement into their back log.

Ability to open, read, edit and save arbitrary text files in Katalon Studio

but there seems to be no progress yet.

[automation1]

I don’t agree that ignoring the settings directory is harmless. If you use certain settings like quitting the browser after test case execution or analytics then all of this information is lost when repo’s are cloned/pulled. I am the main person developing scripts and I want everyone to get the settings that I intend for everyone to use with each clone or pull.

With that said, it seems very odd that these files require a date/time stamp as a comment inside the file when the system already stores this data.

[kazurayam]

@automation1

I don’t agree that ignoring the settings directory is harmless. … I am the main person developing scripts and I want everyone to get the settings that I intend for everyone to use with each clone or pull.

I would take your point.

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

Once @devalex88 wrote

.gitignore template for Katalon Studio

Thank you all for the feedback. In 6.4.0 .gitignore will be added to the project template.

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

[soichi.takamura]

I’m using Katalon Studio 7.2.1 and getting the same error. Thanks for this thread, it’s very one that I’m facing.

I agree with @automation1 . I’m a maintainer who lets QAs increase test cases. I’d like them to share the basic setting among them.

Maybe .gitignore ing “settings” directory is just a workaround and we should get rid of the root cause?

[anuradha]

Hello,

Has anyone been able to resolve this issue. I am having the same problem with katalon 7.2.1.

Thanks

[kazurayam]

@soichi.takamura

Maybe .gitignore ing “settings” directory is just a workaround and we should get rid of the root cause?

No. There is no hidden mysterious root cause.

Each members of your team inevitably modify files under the settings directory. If you have files under the “settings” included in the repository (in other words you do not .gitignore them), then everyone will experience merge conflicts.

.gitignore ing “settings” directory is the only solution you can take.

[soichi.takamura]

I’m sort of away from Katalon though, the conflict occurred despite my terminal command git pull succeeded. I got stuck using Git integration from GUI unless I .gitignored and that’s nothing but a problem.

Additionally, don’t you think it’s a common scenario for engineers to provide a shared setting to automation QAs? I think there’s room to improve.

Hope it helps

[kazurayam]

@soichi.takamura

the conflict occurred despite my terminal command git pull succeeded

If you have any confict, then “git pull” will never succeed. Right?

I do not understand what you mean here. Any screenshot?

[kazurayam]

@soichi.takamura

Additionally, don’t you think it’s a common scenario for engineers to provide a shared setting to automation QAs? I think there’s room to improve.

Then what is your idea?

Aren’t you willing to devote yourself to solve your itchy problem?

---

I suppose 2 actions would suffice:

1. .gitignore files under settings/
2. Write a document in natural language (in English, по русски, 日本語で etc) attached with some screenshots; the doc instructs QA workers how they should setup Katalon Studio on their own PC; and call a hands-on session of 1 hour long.

---

By the way, let me show you my previous post concerning git merge/pull conflicts in Katalon Studio project in the hope that it shows you how an issue concerning git confits is complicated.

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

[anuradha]

settings/ is already in my gitignore file but still this error keeps on appearing when i merge my changes and this was not happening before. I am using katalon 7.2.1. Has something change?