Git find merge conflicts

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

Source: stackoverflow.com

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

Similar codes

12 votes341 views1 answer
Git pull or fetch difference
Shell/Bash
0 vote348 views1 answer
Bower uninstall
Shell/Bash
0 vote318 views1 answer
Install minikube on windows 10 using chocolatey
Shell/Bash
12 votes352 views5 answers
Ifconfig command not found
Shell/Bash
3 votes370 views4 answers
Kill process linux using port
Shell/Bash
7 votes362 views4 answers
Git restore file
Shell/Bash
0 vote327 views1 answer
Sed up to first match
Shell/Bash
1 vote356 views1 answer
Datetime echo shell script
Shell/Bash
0 vote416 views1 answer
Dash bootstrap import
Shell/Bash
0 vote369 views1 answer
Git create fodler
Shell/Bash