YemSalat

git diff --name-only --diff-filter=U - list all conflict files (filenames only)

git rm --cached filename.txt - remove file from cache (useful if file is added to gitignore after it was already commited)