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

7 votes158 views2 answers
Docker network not found
Shell/Bash
0 vote138 views2 answers
How to install kind
Shell/Bash
23 votes148 views6 answers
Revert unstaged changes git
Shell/Bash
0 vote175 views1 answer
Express-generator with ejs
Shell/Bash
1 vote145 views1 answer
How to access postgres CLI
Shell/Bash
6 votes149 views1 answer
Rm is not recognized as internal command
Shell/Bash
2 votes150 views2 answers
Rsync only new files
Shell/Bash
6 votes158 views6 answers
EXPRESS generator
Shell/Bash
1 vote206 views1 answer
How to install pgzrun
Shell/Bash
0 vote180 views1 answer
Typeerror: __init__() got an unexpected keyword argument 'column'
Shell/Bash