“Diff/Merge” option is not visible on Katalon preferences under GIT. However, its in the screen shot on this link in Katalon website https://docs.katalon.com/docs/create-tests/manage-projects/project-settings/git-integration/work-with-git-in-katalon-studio
Please advise
Thanks community 
If there is any conflict via pull or merge , katalon will automatically open the conflicts. Just correct the conflicts and it will automatically be merged.
Yes, there is no diff merge option .
As I said before , use backend terminals for these git related operations.
Remember, merge will make your life inconvenient (if conflicts) if not used wisely and tactfully
YOU were RIGHT!!! I have no issues using the command line to push up to git using VS code command line!
Ok I will let me coworker knoq.
