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

13 votes325 views3 answers
Git remove repository local
Shell/Bash
3 votes288 views1 answer
Run docker image ubuntu
Shell/Bash
2 votes311 views1 answer
How to make all directory 775
Shell/Bash
0 vote314 views1 answer
Pymongo.errors.ServerSelectionTimeoutError: localhost:27017
Shell/Bash
0 vote359 views1 answer
Set gcc path to vscode in ubuntu
Shell/Bash
2 votes303 views2 answers
Installing react react-dom and react-scripts with cra-template has failed
Shell/Bash
52 votes306 views6 answers
Git apply stash
Shell/Bash
2 votes331 views1 answer
Bash vi mode
Shell/Bash
0 vote325 views1 answer
Add local folder to git repo
Shell/Bash
0 vote322 views1 answer
Fix is installed in '/home/incredible/.local/bin' which is not on PATH
Shell/Bash