How to resolve merge conflicts in katalon?


#1

Hi, is there any way to resolve merge conflicts in katalon studio itself.


#2

Hello @rana.annabathina,

The only way we managed to solve them kind of were to edit the gitignore to something like this:
/bin/
/Libs/
/.settings/
/.classpath
/.svn/
/Reports/
/settings/internal/com.kms.katalon.composer.testcase.properties

But there still were some problems… So now we are using Sourcetree to manage all Projects in one Repository and chaged the .gitignore to this:
**/bin/
**/Libs/
**/.settings/
**/.classpath
**/.svn/
**/Reports/
**/settings/internal/com.kms.katalon.composer.testcase.properties

which works perfectly if you dont forget to close the Project in Katalon before commiting.