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

1 vote131 views1 answer
Bash slurm view jobs from date
Shell/Bash
5 votes135 views1 answer
Stash with new files
Shell/Bash
0 vote109 views1 answer
Cloud functions environment variables
Shell/Bash
0 vote116 views1 answer
If you'd like to use Babel 6.x ('babel-core'), you should install 'babel-loader@7'.
Shell/Bash
-1 vote108 views2 answers
Postgresql user permissions to database
Shell/Bash
0 vote110 views1 answer
How to check version of web3
Shell/Bash
0 vote119 views1 answer
Postgre create user
Shell/Bash
6 votes71 views2 answers
Ubuntu install ffmpeg
Shell/Bash
1 vote113 views1 answer
Ssh open tunnel command line
Shell/Bash
0 vote114 views2 answers
Git branch set remote tracking branch
Shell/Bash