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

4 votes326 views2 answers
Install package chart.js
Shell/Bash
0 vote334 views1 answer
How to take a screenshot with on raspberry pi
Shell/Bash
5 votes364 views1 answer
How to activate administrator account in windows 10 command prompt
Shell/Bash
86 votes350 views5 answers
Python update pip3
Shell/Bash
0 vote325 views1 answer
Batch file drive
Shell/Bash
2 votes366 views1 answer
Search in history command windows
Shell/Bash
2 votes327 views1 answer
How to update centos
Shell/Bash
0 vote328 views1 answer
Spotify combo chercker
Shell/Bash
3 votes330 views1 answer
How to check if in which folder are you present in linux
Shell/Bash
6 votes356 views4 answers
Install xampp ubuntu 20.04
Shell/Bash