- I create test case 1, and committed it to branch 1.
- My colleague created test case 2 and committed to branch 2
- My question here is, how can I combine both branches to master?
Any news on this ?
If we cannot merge with Katalon, what would be the best way to do it with an other software ?
Here are some tutorials on using Git with Katalon Studio (https://www.katalon.com/resources-center/tutorials/git-conflict-resolve/).
In case you have trouble with Git and cannot complete with KS, SourceTree is also a good alternative.