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 vote186 views1 answer
Apt install force
Shell/Bash
0 vote201 views2 answers
Move files command line windows
Shell/Bash
0 vote158 views1 answer
Download sklearn arch
Shell/Bash
9 votes194 views5 answers
Create a ssh key
Shell/Bash
1 vote200 views1 answer
How to install gitkraken on fedora
Shell/Bash
2 votes161 views1 answer
Uninstall package in r jupyter notebook
Shell/Bash
25 votes204 views3 answers
Linux compress folder
Shell/Bash
0 vote195 views1 answer
Git log show branch of commit
Shell/Bash
4 votes205 views6 answers
Aos library
Shell/Bash
0 vote211 views1 answer
Go download all packages
Shell/Bash