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 vote152 views1 answer
Net start docker
Shell/Bash
0 vote198 views1 answer
ERLANG MAC OS
Shell/Bash
0 vote217 views1 answer
Open text file from terminal
Shell/Bash
2 votes204 views1 answer
How to check which process is using more memory in linux
Shell/Bash
0 vote218 views1 answer
Homestead.yaml adding provisions
Shell/Bash
2 votes196 views1 answer
Network manager restart ubuntu
Shell/Bash
0 vote196 views1 answer
System information from terminal linux
Shell/Bash
0 vote258 views4 answers
Jq examples
Shell/Bash
0 vote210 views1 answer
Escape tty linux keyboard
Shell/Bash
0 vote226 views1 answer
Install pydotplus by pip ubuntu
Shell/Bash