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 vote200 views1 answer
Troll someone
Shell/Bash
1 vote179 views3 answers
Delete from git history
Shell/Bash
0 vote191 views2 answers
Create linux user with non interactive shell
Shell/Bash
74 votes185 views6 answers
Force pull git
Shell/Bash
0 vote202 views1 answer
Error eacces permission denied mkdir xampp ubuntu
Shell/Bash
0 vote184 views1 answer
Installing sdk manager on ubuntu
Shell/Bash
0 vote203 views1 answer
Check if service is running server
Shell/Bash
7 votes189 views2 answers
Install pip arch linux
Shell/Bash
3 votes206 views2 answers
Du sort by size
Shell/Bash
12 votes217 views4 answers
Apt vs apt-get
Shell/Bash