How to resolve conflicts while pushing the code to git through katalon

Archive
,
1

Hi ,

Can anyone please help me how to resolve the conflicts when pushing the code to github
here i have attached a copy

image
image1920×1080 269 KB

2

Hi @nikhil.nareddy

I suggest you try Visual Code to open the file, it has buttons for you to either accepting changes in current branch or incoming branch as well from both.

Regards !