How to resolve merge conflicts in katalon?

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

Hello @rana.annabathina,

The only way we managed to solve them kind of were to edit the gitignore to something like this:

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:

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