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 vote138 views2 answers
Git create github repo
Shell/Bash
2 votes166 views1 answer
Kumaran km github
Shell/Bash
0 vote143 views1 answer
Append to a file from terminal
Shell/Bash
1 vote140 views1 answer
Count number of lines in directory linux
Shell/Bash
1 vote215 views2 answers
Install safari in ubunut
Shell/Bash
0 vote162 views1 answer
C# tostring 2 digit hex
Shell/Bash
6 votes129 views5 answers
Ubuntu install snap
Shell/Bash
0 vote134 views1 answer
Rm lastUpdated maven
Shell/Bash
0 vote142 views2 answers
Struct main function c in unix
Shell/Bash
1 vote133 views1 answer
Restart php nginx mac
Shell/Bash