How to find conflicting files in GIT?

Asked

Viewed 1,562 times

3

Let’s say I just made one git pull. Then, for some movement I closed the Terminal (In the Ubuntu, for example) and I haven’t seen which files are marked as CONFLICT.

I already learned in a way where I would execute command grep 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 it for yourself GIT?

git

1 answer

4


  • Really, it worked! I wonder what this is for diff?

  • 1

    To see the differences between any two versions. If you type only git diff it shows all the differences between the current directory and the index, but can do much more (worth another question)

Browser other questions tagged git

You are not signed in. Login or sign up in order to post.