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

125 votes239 views6 answers
Install react bootstrap
Shell/Bash
1 vote223 views1 answer
Como saber la distribucion de linux por consola
Shell/Bash
10 votes237 views3 answers
Pip command not found macos
Shell/Bash
1 vote241 views1 answer
Ubuntu install without suggested packages
Shell/Bash
0 vote230 views1 answer
Rubocop gem install specific version
Shell/Bash
21 votes250 views6 answers
Install npm
Shell/Bash
0 vote231 views1 answer
How to install terraform in ubuntu 18.04
Shell/Bash
0 vote250 views1 answer
Ubuntu format new drive and mount for backup
Shell/Bash
1 vote223 views2 answers
Docker machine ip
Shell/Bash
0 vote238 views1 answer
Installing ipython-sql in Jupyter
Shell/Bash