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 vote149 views1 answer
Install ignite-cli
Shell/Bash
0 vote153 views1 answer
Command to upgrade broken/not upgraded packages on Ubuntu
Shell/Bash
80 votes151 views6 answers
Git cancel last commit
Shell/Bash
0 vote150 views1 answer
Redis delete
Shell/Bash
9 votes163 views2 answers
How to undo a git stash
Shell/Bash
8 votes161 views3 answers
Get the size of files in a directory linux
Shell/Bash
0 vote151 views1 answer
HFSS parametic sweep in batch
Shell/Bash
0 vote143 views1 answer
Ubuntu kill process on a port
Shell/Bash
0 vote150 views1 answer
Bash loop lines in file
Shell/Bash
2 votes166 views3 answers
FirewallD is not running
Shell/Bash