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 vote97 views1 answer
Set windows transaparancy linux
Shell/Bash
1 vote92 views1 answer
How to install cuckoo sandbox
Shell/Bash
0 vote95 views1 answer
Ubuntu dual monitor mouse flicker
Shell/Bash
1 vote102 views1 answer
Windows environment variables home directory
Shell/Bash
0 vote113 views1 answer
Upgrade spyer 4.2.0 in anaconda
Shell/Bash
9 votes129 views1 answer
Elementary os vscode
Shell/Bash
1 vote99 views1 answer
Generate 6 digit random number in codeigniter
Shell/Bash
0 vote107 views1 answer
Pip install softdelet
Shell/Bash
1 vote57 views1 answer
Linux remove symbolic link without deleting directory
Shell/Bash
9 votes92 views4 answers
Install pyenv
Shell/Bash