Imagine that I just made a git pull . So, for some reason I closed Terminal (No Ubuntu , for example) and did not see what files are marked as CONFLICT .
I've already learned in a way where I would run the grep command in the local repository directory.
Example:
> grep -Hrs "<<< HEAD" .
How can I do (otherwise) to find out which files are conflicting?
Is there any way to do this by GIT itself?