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 vote156 views1 answer
Show drives linux
Shell/Bash
0 vote166 views1 answer
LF will be replaced by CRLF hassan
Shell/Bash
0 vote226 views1 answer
Exclude certain extension from zip linux
Shell/Bash
0 vote163 views1 answer
How can I specific line in ubuntu?
Shell/Bash
0 vote157 views1 answer
Streams in unix
Shell/Bash
1 vote181 views1 answer
Bash delete a range of lines from a file
Shell/Bash
0 vote301 views1 answer
Output to log file and error to log error
Shell/Bash
2 votes170 views1 answer
Upgrade chocolatey
Shell/Bash
0 vote165 views1 answer
Push subtree to github pages
Shell/Bash
1 vote166 views1 answer
Npm install upgrade react version react-scripts
Shell/Bash