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

6 votes280 views2 answers
Npm install --save-dev @angular/cli@latest
Shell/Bash
-1 vote285 views1 answer
Take clone from gitbash
Shell/Bash
0 vote277 views1 answer
How much time does powershell take to install wsl
Shell/Bash
6 votes299 views3 answers
Cancel a commit not pushed
Shell/Bash
0 vote282 views1 answer
How to reslove Jira Software is licensed but not currently installed
Shell/Bash
23 votes287 views2 answers
Mysql database drop
Shell/Bash
2 votes336 views2 answers
Git delete local branch except master
Shell/Bash
17 votes249 views2 answers
Git check upstream
Shell/Bash
3 votes270 views2 answers
Running Laravel Application
Shell/Bash
1 vote268 views1 answer
Keep the container running and not exit directly
Shell/Bash