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 votes327 views2 answers
Open crontab in nano
Shell/Bash
23 votes347 views6 answers
How to install node using nvm
Shell/Bash
0 vote330 views1 answer
Docker alpine create user and group
Shell/Bash
8 votes344 views2 answers
Ubuntu open task manager
Shell/Bash
0 vote336 views1 answer
Install chef client centos
Shell/Bash
34 votes335 views6 answers
Git store credentials
Shell/Bash
28 votes332 views5 answers
Kubectl create namespace
Shell/Bash
0 vote339 views1 answer
Helm install with values.yaml
Shell/Bash
0 vote323 views1 answer
How to pass a user defined argument in scrapy spider
Shell/Bash
7 votes352 views2 answers
Whatapp
Shell/Bash