Resolve Git conflicts using Katalon Studio

[system]

---

This is a companion discussion topic for the original entry at https://docs.katalon.com/katalon-studio/tutorials/git_conflict_resolve.html