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 vote174 views1 answer
Virtualbox linux manjaro
Shell/Bash
0 vote173 views1 answer
Linux waitptid function
Shell/Bash
0 vote175 views1 answer
Install global package golang
Shell/Bash
1 vote178 views1 answer
Install dependencies @material-ui/lab/Rating
Shell/Bash
0 vote184 views1 answer
The unit apache2.service has entered the 'failed' state with result 'exit-code'
Shell/Bash
5 votes237 views2 answers
Run prettier
Shell/Bash
0 vote181 views1 answer
Ubuntu sha256
Shell/Bash
1 vote204 views2 answers
Dpkg
Shell/Bash
1 vote193 views1 answer
(END) windows command line
Shell/Bash
0 vote184 views1 answer
Nasm compile windows 64
Shell/Bash