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 C…

[image] 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 m…

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…

zbeck008, c/c @YoungNgo , @devalex88 [image] 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 woul…

I have ever posted some in this Forum asking Katalon Team to let me edit .gitigore and README.md files. [image] Want to edit .gitignore and README.md in Katalon Studio Katalon Studio Almost all of my Katalon Studio projects have .gitignore file and README.md file as the f…

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 se…

[image] 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 .gitig…

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 …

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

[image] 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…

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 settin…

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

Web Testing

kazurayam September 12, 2019, 12:24am 13

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.

Topic		Replies	Views
Git hub conflicts Web Testing katalon-studio	1	1428	August 18, 2020
Remove timestamps from .properties files in settings folder Feature Request katalon-studio , feature-request , tracked	9	2257	December 20, 2021
How to resolve merge conflicts in katalon? Web Testing katalon-studio	1	1671	December 3, 2019
Why changes of <lastRun> info in a *.ts file conflict --- how to prevent it Web Testing katalon-studio , tips-tricks	2	3249	December 10, 2018
Cannot solve conflicts using katalon during merging of codes from different branches to a single branch Feature Request katalon-studio , feature-request	2	522	August 8, 2022

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

Related topics