How to overcome this problem checkout conflict with files when pull from git

[KingZ]

How to solve this problem?

[danzaaa98]

Hello @KingZ,

Try to first commit your changes and then Pull from git… Maybe that works

[KingZ]

Thanks for your reply