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 vote292 views1 answer
K3os configure SSH
Shell/Bash
-1 vote311 views1 answer
Add one drive to ubuntu
Shell/Bash
0 vote330 views1 answer
How to restore default apache httpd conf file
Shell/Bash
6 votes339 views3 answers
How to enable autocomplete in jupyter notebook
Shell/Bash
1 vote320 views1 answer
Wmv to mp4 ffmpeg
Shell/Bash
34 votes305 views6 answers
Ubuntu install pip
Shell/Bash
0 vote298 views1 answer
Webpack for old browser
Shell/Bash
1 vote303 views2 answers
Django.core.exceptions.ImproperlyConfigured: The SECRET_KEY setting must not be empty
Shell/Bash
3 votes304 views1 answer
Linux screen brightness command line
Shell/Bash
0 vote353 views2 answers
How to change the time in kali linux
Shell/Bash