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

9 votes154 views3 answers
Install ssh linux
Shell/Bash
3 votes125 views1 answer
How to check if in which folder are you present in linux
Shell/Bash
21 votes144 views4 answers
Install postgresql on mac
Shell/Bash
3 votes132 views1 answer
Install packages from jupyter notebook
Shell/Bash
37 votes126 views5 answers
Git merge abort
Shell/Bash
0 vote120 views1 answer
View a git log for a specific file
Shell/Bash
0 vote164 views1 answer
Ubuntu turn off monitor
Shell/Bash
0 vote114 views2 answers
Aos animate install
Shell/Bash
0 vote120 views1 answer
How to install graphql client on manjaro linux
Shell/Bash
0 vote109 views1 answer
Run specific migration file django
Shell/Bash