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

-1 vote147 views2 answers
Azure PowerShell module
Shell/Bash
0 vote119 views1 answer
Git change email of old commit
Shell/Bash
0 vote123 views1 answer
Bash get lines between
Shell/Bash
-1 vote115 views2 answers
Conda install ipywidgets
Shell/Bash
1 vote122 views1 answer
Ssh connect to host bitbucket.org port 22: Connection timed out
Shell/Bash
9 votes135 views1 answer
Check remote link git
Shell/Bash
13 votes128 views3 answers
Cypress install
Shell/Bash
0 vote132 views1 answer
Kill a process by looking up the port in windows
Shell/Bash
0 vote126 views1 answer
Install angular animation 10.0.12
Shell/Bash
0 vote120 views3 answers
Linux convert to sha256
Shell/Bash