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

0 vote209 views1 answer
Install gitlab runner on centos
Shell/Bash
0 vote173 views1 answer
Gatsby-plugin-feed-generator
Shell/Bash
1 vote173 views1 answer
Phpunit/phpunit[8.5.8, ..., 8.5.x-dev, 9.3.3, ..., 9.5.x-dev] require ext-dom * -> it is missing from your system. Install or enable PHP's dom extension
Shell/Bash
0 vote180 views1 answer
Grant user root permissions oracle linux
Shell/Bash
11 votes228 views2 answers
Github add image to readme.md
Shell/Bash
26 votes176 views10 answers
Bootstrap
Shell/Bash
0 vote233 views1 answer
Powershell delete scoop
Shell/Bash
28 votes175 views5 answers
Ram usage in linux
Shell/Bash
0 vote174 views1 answer
Delete tags github
Shell/Bash
-1 vote183 views5 answers
Run jar file
Shell/Bash