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 vote205 views1 answer
Can't uninstall adobe creative cloud
Shell/Bash
0 vote210 views1 answer
Git bash terminal weird characters
Shell/Bash
1 vote191 views1 answer
Ubuntu bluetooth not listed
Shell/Bash
6 votes204 views5 answers
Install jetstream
Shell/Bash
7 votes192 views3 answers
Bluetooth not working in ubuntu 20.04
Shell/Bash
0 vote197 views1 answer
Django view sql behind migration
Shell/Bash
0 vote190 views1 answer
Anbox linux
Shell/Bash
0 vote188 views1 answer
Video editor for ubuntu 21.10
Shell/Bash
0 vote201 views1 answer
Decompress bz2
Shell/Bash
0 vote174 views1 answer
Centos 7 openldap install
Shell/Bash