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 vote342 views1 answer
How to make QtWebengine have smooth scrolling
Shell/Bash
3 votes366 views1 answer
Git existing code to new repository
Shell/Bash
17 votes362 views4 answers
Git clone recursive
Shell/Bash
2 votes365 views2 answers
Redis cli connect to remote server with password
Shell/Bash
1 vote390 views1 answer
How to push local created commit to another branch in git
Shell/Bash
3 votes355 views3 answers
Git branch change remote
Shell/Bash
3 votes379 views1 answer
Install react react testing library
Shell/Bash
0 vote338 views1 answer
Webpack/config/html
Shell/Bash
2 votes360 views1 answer
Upgrade plotly version
Shell/Bash
2 votes375 views1 answer
How to open gedit using terminal
Shell/Bash