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 vote234 views1 answer
Rkunter after get ubuntu new release
Shell/Bash
0 vote244 views1 answer
Fatal: unable to access 'https://gitlab.thedigitalacademy.co.za/sign-language-translator/frontend.git/': SSL certificate problem: certificate has expired
Shell/Bash
8 votes233 views2 answers
Git tag and relasease
Shell/Bash
12 votes266 views4 answers
Git how to undo a pushed commit
Shell/Bash
2 votes238 views1 answer
Increase no of watchers
Shell/Bash
0 vote238 views1 answer
Git log with author oneline
Shell/Bash
1 vote252 views2 answers
Composer install package with specific version
Shell/Bash
0 vote242 views1 answer
Git grep in commits
Shell/Bash
0 vote253 views1 answer
How to create a shortcut to a folder on linux
Shell/Bash
2 votes240 views6 answers
Ubuntu install lamp
Shell/Bash