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 vote180 views3 answers
Docker redis
Shell/Bash
0 vote176 views1 answer
Raspberry pi start browser full screen
Shell/Bash
1 vote174 views1 answer
Create text file with 64 bytes in ubuntu
Shell/Bash
8 votes220 views5 answers
Install bootstrap icons
Shell/Bash
0 vote225 views1 answer
Ll command not found
Shell/Bash
0 vote186 views1 answer
Libcblas-dev
Shell/Bash
6 votes165 views2 answers
Go to line vscode
Shell/Bash
-3 votes274 views1 answer
$100 dollar phones
Shell/Bash
1 vote229 views1 answer
Input is required, but Expo CLI
Shell/Bash
0 vote176 views1 answer
Overleaf git no password
Shell/Bash