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 vote263 views1 answer
Bash if number greater than zero
Shell/Bash
9 votes259 views3 answers
Linux remove folder and all his content
Shell/Bash
2 votes275 views2 answers
Customize dock in ubuntu
Shell/Bash
-3 votes264 views1 answer
$100 dollar phones
Shell/Bash
5 votes285 views10 answers
Docker ps with ip
Shell/Bash
0 vote266 views1 answer
Fstab sshfs
Shell/Bash
4 votes264 views3 answers
Substring if statement variable shell script
Shell/Bash
0 vote291 views1 answer
How to make NTFS read only file system writable in linux
Shell/Bash
1 vote282 views1 answer
Remove space at end of each line file
Shell/Bash
0 vote266 views1 answer
Bash loop local variable
Shell/Bash