How to resolve conflicts while pull the code from git through katalon


Can anyone please help how to resolve the conflicts when pull the code from github.


How to Resolve Conflicts Dirty_WorkTree in git repository.

  1. Please share your .gitignore file.

  2. And tell us if you work on Windows, Mac or Linux.

  3. Can you execute git command in console?