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:
CONFLICT (content): Merge conflict in settings/internal/com.kms.katalon.composer.testcase.properties
$ 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.
8aef845…b1276ed Development -> origin/Development
error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge.
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?
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.
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.
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.
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.
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.
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).
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.
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.
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.
Aren’t you willing to devote yourself to solve your itchy problem?
I suppose 2 actions would suffice:
.gitignore files under settings/
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.