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

60 votes106 views6 answers
Git remote
Shell/Bash
0 vote105 views1 answer
How to use valet to share localhost url to outside
Shell/Bash
8 votes113 views2 answers
Chown
Shell/Bash
0 vote96 views1 answer
Conda install libsndfile
Shell/Bash
34 votes108 views6 answers
Update cypress
Shell/Bash
0 vote96 views1 answer
Install dlib gpu check
Shell/Bash
481 votes291 views10 answers
December global holidays
Shell/Bash
4 votes159 views6 answers
Flutter plugin not installed; this adds Flutter specific functionality
Shell/Bash
10 votes99 views3 answers
Force delete pod kubernetes
Shell/Bash
0 vote94 views1 answer
Bash get lines between
Shell/Bash