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 vote171 views1 answer
Cannot find plugin.xml for plugin @havesource
Shell/Bash
2 votes174 views1 answer
Ubuntu "Read-only filesystem"
Shell/Bash
0 vote171 views1 answer
Go test color output
Shell/Bash
0 vote145 views1 answer
Run camunda in linux mint
Shell/Bash
6 votes208 views2 answers
How to open .conf ubuntu
Shell/Bash
0 vote177 views3 answers
How to add passphrase to ssh key
Shell/Bash
0 vote176 views1 answer
Install h5py in jetson nano
Shell/Bash
0 vote164 views1 answer
Set windows transaparancy linux
Shell/Bash
0 vote158 views1 answer
Diff between user variables and system variables
Shell/Bash
1 vote180 views1 answer
Powershell print to console
Shell/Bash