Hi,
We use Katalon Studio to automate our test cases and push the code to our team’s GitHub repository. However, we often encounter conflicts and issues during this process. To resolve these conflicts or create smoother pull requests, we currently rely on Visual Studio.
We want to explore leveraging Katalon Studio to its fullest potential. Could you guide us or provide any documentation that explains how to manage and resolve merge conflicts directly within Katalon Studio?
Thanks.!
there’s better explanation on the katalon documentation @nishtha.babbar
you can find it here Work with Git in Katalon Studio | Katalon Docs
Hi there, there is a course about this: Enhancing team collaboration with Git and Katalon Studio integration Hope this helps.
You should rather write “how to resolve merge conflicts”.
The way you use the term “pull request” is wrong. The term “Pull Request” is a well-known term specifically used in GitHub:
Create a pull request to propose and collaborate on changes to a repository. These changes are proposed in a branch , which ensures that the default branch only contains finished and approved work.
This is not what @nishtha.babbar is talking about, I believe.
VS Code with a Git extension (like GitLess) is quite helpful and offers a slightly more user-friendly interface
Personally I use the Terminal of VSCode (I use bash on Mac) where I use “git” commands, like
$ git pull
$ git status
$ git add .
$ git commit -m "xxx"
$ git push
I don’t need any GUI for executing the git commands.
I learned Git in the command line interface.
I wouldn’t bother myself with learning varieties of GUI.
KS does not offer the Terminal so I prefer VSCode to KS.