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 votes95 views1 answer
How to check if django is installed in ubuntu
Shell/Bash
58 votes139 views6 answers
Copilot github
Shell/Bash
0 vote132 views1 answer
Ubuntu ssl error you have not chosen to trust entrust certification authority - g2
Shell/Bash
1 vote131 views1 answer
Linux exit file path
Shell/Bash
1 vote135 views2 answers
Remove oh my zsh ubuntu
Shell/Bash
0 vote134 views1 answer
Error: Couldn't find that app. » » Error ID: not_found
Shell/Bash
0 vote128 views1 answer
Azure cli start aks cluster
Shell/Bash
4 votes131 views1 answer
Nvm fish shell
Shell/Bash
0 vote131 views1 answer
Vim code highlighting mac
Shell/Bash
1 vote199 views1 answer
How to reload docker nginx
Shell/Bash