HI All,
Git merge is showing conflict for the file and for same file when i use checkout command specific file from branch it is not showing conflict.
git merge dev
Checkout command
git checkout sit --src/app.cls