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

0 vote286 views1 answer
Tar exception
Shell/Bash
0 vote279 views1 answer
Root folders via gui ubuntu
Shell/Bash
0 vote279 views1 answer
Osx remvoe env
Shell/Bash
5 votes279 views6 answers
Laravel create project
Shell/Bash
9 votes310 views5 answers
Flutter build appbundle
Shell/Bash
1 vote332 views1 answer
Jasmine.clock().install() jest
Shell/Bash
0 vote299 views1 answer
Edit git commit
Shell/Bash
0 vote324 views1 answer
How to search .class file in unix
Shell/Bash
0 vote328 views1 answer
SHOULD AVOID - SECURITY RISK
Shell/Bash
0 vote288 views1 answer
Find command path
Shell/Bash