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

3 votes193 views1 answer
Mkv to mp4 linux
Shell/Bash
0 vote301 views2 answers
List pid bash
Shell/Bash
4 votes196 views1 answer
Git create new default branch
Shell/Bash
2 votes178 views1 answer
Linux view file refresh
Shell/Bash
0 vote181 views1 answer
How to save history of commands in linux
Shell/Bash
0 vote220 views1 answer
Solidity optimizer runs
Shell/Bash
4 votes249 views2 answers
Install torch anaconda
Shell/Bash
0 vote325 views1 answer
Reinit git-submodules
Shell/Bash
20 votes185 views6 answers
Install mongodb mac
Shell/Bash
1 vote183 views1 answer
Install geary ubuntu
Shell/Bash