In this article let’s discuss about Git find merge conflicts. Let’s go through the following methods without any delay.
git diff --name-only --diff-filter=U
If you are facing any issues with the above approach then try the alternative that is given below. It may look similar by have a try!
Method 2 :
git stash -- > take my project to temp memory git pull -- > pull the project from GitHub to working directory (my computer) git stash pop -- > take my project to my working directory, fix the conflict and merge the project. git add . git commit –m “comment” git push
Hope the above solution works.
Realted Posts : How to show conflcited files