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

3 votes177 views2 answers
How to uninitialize git
Shell/Bash
5 votes176 views6 answers
Pip install psycopg2 error
Shell/Bash
0 vote165 views1 answer
Download all branched on git clone
Shell/Bash
2 votes173 views1 answer
Composer install via cmd
Shell/Bash
0 vote211 views1 answer
Supertest example
Shell/Bash
34 votes186 views3 answers
Remove stash files git
Shell/Bash
0 vote246 views1 answer
To set the exit status of a shell script
Shell/Bash
44 votes169 views5 answers
How to install unzip in ubuntu
Shell/Bash
0 vote165 views1 answer
Linux cp everything except
Shell/Bash
0 vote167 views1 answer
How to check jenkins version in ubuntu
Shell/Bash