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

15 votes136 views1 answer
Download dart manual mac
Shell/Bash
75 votes183 views6 answers
Ubuntu install docker
Shell/Bash
2 votes159 views3 answers
Kill a process on Ubuntu
Shell/Bash
1 vote166 views1 answer
Rostopic echo filter
Shell/Bash
10 votes199 views1 answer
Install a pkge at a specified version
Shell/Bash
0 vote151 views1 answer
Cuda : Depends: cuda-11-5 (>= 11.5.0) but it is not going to be installed
Shell/Bash
0 vote127 views1 answer
How to deploy firebase application in raspberry
Shell/Bash
-1 vote144 views6 answers
Linux commands list
Shell/Bash
6 votes174 views2 answers
How to download using curl
Shell/Bash
0 vote154 views1 answer
How to install multiple linux package in one line
Shell/Bash