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

[mahesh.tirumandyam]

Hi,

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

DIRTY_WORKTREE .classpath

How to Resolve Conflicts Dirty_WorkTree in git repository.

[kazurayam]

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?