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 vote299 views1 answer
If the {string} part is omitted, it is considered as an empty string, and the matched pattern is deleted. The following command deletes all instances of the string ‘foo’ in the current line
Shell/Bash
0 vote288 views1 answer
Npm unpublish versino
Shell/Bash
1 vote287 views1 answer
How to save multiple files in vim at once
Shell/Bash
0 vote267 views1 answer
Vim emacs
Shell/Bash
0 vote293 views1 answer
How to run spigot server using bat
Shell/Bash
17 votes273 views3 answers
Snap uninstall
Shell/Bash
2 votes282 views1 answer
Firebase rules deploy
Shell/Bash
1 vote271 views1 answer
Ubuntu vs lubuntu
Shell/Bash
0 vote259 views1 answer
How to start xammp on linux
Shell/Bash
0 vote305 views1 answer
Remove mariadb
Shell/Bash