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

1 vote96 views1 answer
How to retrieve the address of a Remote REPO
Shell/Bash
22 votes109 views5 answers
Xamp start ubuntu
Shell/Bash
0 vote106 views2 answers
Install tomcat on mac brew
Shell/Bash
1 vote126 views1 answer
Code UNABLE_TO_GET_ISSUER_CERT_LOCALLY
Shell/Bash
63 votes104 views6 answers
Get git origin url
Shell/Bash
0 vote104 views1 answer
Bash weather report
Shell/Bash
0 vote110 views1 answer
Remote repo push
Shell/Bash
4 votes107 views1 answer
Ubuntu remove package and dependencies install deb
Shell/Bash
2 votes93 views2 answers
Npm postgres
Shell/Bash
22 votes112 views4 answers
Remove ppa from ubuntu
Shell/Bash