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 vote353 views1 answer
Start MySQL FreeBSD
Shell/Bash
-1 vote386 views2 answers
Install geopandas
Shell/Bash
1 vote388 views3 answers
Installer lamp ubuntui
Shell/Bash
0 vote355 views1 answer
How to get unmerged branch git
Shell/Bash
1 vote357 views1 answer
Curl default connect-timeout
Shell/Bash
0 vote350 views2 answers
Btfs paket ubunt
Shell/Bash
11 votes378 views6 answers
Linux ram info
Shell/Bash
1 vote295 views1 answer
Linux change default shell for all users
Shell/Bash
0 vote347 views1 answer
Thelinuxterminal.com install nvm
Shell/Bash
1 vote353 views1 answer
How to kwno if my mac has intel 32 or 64
Shell/Bash