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

5 votes129 views1 answer
Ubuntu install i3
Shell/Bash
0 vote132 views1 answer
Adoptopenjdk to linux docker image
Shell/Bash
1 vote131 views1 answer
Ubuntu Install a file integrity tool to monitor changes to critical and sensitive files
Shell/Bash
8 votes131 views3 answers
Push a new branch
Shell/Bash
1 vote145 views1 answer
Can makefile commands take parameters
Shell/Bash
0 vote148 views1 answer
Datatable npm install
Shell/Bash
35 votes138 views6 answers
Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock:
Shell/Bash
5 votes122 views1 answer
View host entires mac terminal
Shell/Bash
0 vote133 views1 answer
Allow a port in centos 8 stackoverflow
Shell/Bash
0 vote121 views1 answer
Copy laravel project from github
Shell/Bash