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

6 votes231 views1 answer
Run startup folder
Shell/Bash
1 vote208 views1 answer
Set hostname on command line ec2
Shell/Bash
-1 vote206 views1 answer
How to install google chrome in ubuntu 32-bit
Shell/Bash
28 votes245 views4 answers
How to unzip Tar file
Shell/Bash
38 votes217 views6 answers
Ubuntu remove directory
Shell/Bash
0 vote222 views1 answer
Curl without progress
Shell/Bash
9 votes213 views5 answers
Poetry install
Shell/Bash
0 vote195 views1 answer
14 http://packages.ros.org/ros/ubuntu bionic InRelease The following signatures were invalid: EXPKEYSIG F42ED6FBAB17C654 Open Robotics <[email protected]> Fetched 4,680 B in 3s (1,803 B/s)
Shell/Bash
1 vote227 views1 answer
Yarn run ios device
Shell/Bash
0 vote243 views1 answer
Git checkout single file
Shell/Bash