git find merge conflicts local and remote code example

Example 1: show conflicts git

git diff --name-only --diff-filter=U

Example 2: how to handle merge conflicts

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