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 vote312 views1 answer
GemWrappers: Can not wrap missing file:
Shell/Bash
18 votes313 views3 answers
Remove git from project
Shell/Bash
0 vote347 views1 answer
E: Package 'tesseract-ocr-dev' has no installation candidate
Shell/Bash
0 vote302 views1 answer
Install mariadb 10.2 ubuntu 16.04
Shell/Bash
0 vote321 views1 answer
Ubuntu no space left on device boot
Shell/Bash
0 vote349 views1 answer
Linux remove mysql server
Shell/Bash
0 vote341 views1 answer
Bluettoth device not shwoing as output in ubuntu
Shell/Bash
0 vote347 views2 answers
How to run command in background bash linux
Shell/Bash
0 vote334 views1 answer
Get last line from string powershell
Shell/Bash
1 vote326 views1 answer
Shopify theme kit for linux
Shell/Bash