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 vote178 views1 answer
Yarn adprettier
Shell/Bash
0 vote189 views1 answer
Bluetooth settings not opening in ubuntu
Shell/Bash
8 votes144 views1 answer
Cmd add to path
Shell/Bash
0 vote179 views1 answer
List all my jobs slurm
Shell/Bash
4 votes173 views1 answer
Linux show number of cores
Shell/Bash
0 vote179 views1 answer
Wormhole for linux
Shell/Bash
2 votes177 views2 answers
Installing rabbitmq on debian
Shell/Bash
0 vote182 views1 answer
How to output color text on batch with exe
Shell/Bash
3 votes174 views1 answer
Mkv to mp4 linux
Shell/Bash
0 vote190 views1 answer
Add and install gem rails
Shell/Bash