cancel merge
git merge --abortabort merge git
git merge --aborthandling 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 pushCopyright © 2021 Codeinu
Forgot your account's password or having trouble logging into your Account? Don't worry, we'll help you to get back your account. Enter your email address and we'll send you a recovery link to reset your password. If you are experiencing problems resetting your password contact us
