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 vote234 views1 answer
Watch tail file linux
Shell/Bash
0 vote220 views1 answer
Awk columns
Shell/Bash
0 vote248 views1 answer
Show all git configurations and their source/origin
Shell/Bash
4 votes288 views4 answers
Oh my zsh
Shell/Bash
11 votes217 views2 answers
Adonis make migration
Shell/Bash
0 vote212 views1 answer
Add fold to path in linux
Shell/Bash
1 vote234 views1 answer
What does the export command do in linux
Shell/Bash
3 votes215 views1 answer
Set path environment variable mac permanently
Shell/Bash
-1 vote236 views9 answers
Django for Beginners
Shell/Bash
0 vote215 views1 answer
Bash sum
Shell/Bash