Answers for "git abandon merge"

23

cancel merge

git merge --abort
Posted by: Guest on June-15-2020
2

abort merge git

git merge --abort
Posted by: Guest on October-02-2020
5

git stop merge

git reset --hard HEAD
Posted by: Guest on May-12-2020
0

handling merge conflict

This is very question because I am facing
with this issue all the time. Basically
conflict arises when more than one commit 
that has to be merged with some change in the
same place or same line of code. In this case
git will not be able to predict which change
to take. So my approach to fix this issue, 
I would stash my project to temporary memory 
and pull the project from github to working directory. 
I would fix the confict and merge the project
and than I would add, commit and
push it the updated version.


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
Posted by: Guest on December-05-2020

Browse Popular Code Answers by Language