handling merge conflict

Add Answer

Obedient Ocelot answered on January 29, 2020 Popularity 10/10 Helpfulness 1/10

answer handling merge conflict

related how to handle merge conflicts

related what is merge conflict in git

related resolve merge conflict

related CONFLICT (content): Merge conflict in

related resolve merge conflict

handling merge conflict

Comment

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

Popularity 10/10 Helpfulness 1/10 Language whatever

Source: Grepper

Tags: conflict merge whatever

Link to this answer
Share Copy Link

Contributed on Dec 05 2020

Obedient Ocelot

0 Answers Avg Quality 2/10

Closely Related Answers

how to handle merge conflicts

Comment

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

Popularity 10/10 Helpfulness 3/10 Language whatever

Source: Grepper

Tags: handle ha

Link to this answer
Share Copy Link

Contributed on Dec 04 2020

Thankful Tuatara

0 Answers Avg Quality 2/10

what is merge conflict in git

Comment

A merge conflict is an event that occurs when Git is unable to
automatically resolve differences in code between two commits.
When all the changes in the code occur on different lines or in
different files, Git will successfully merge commits without
your help

Popularity 10/10 Helpfulness 3/10 Language shell

Source: Grepper

Tags: conflict conflic

Link to this answer
Share Copy Link

Contributed on Jan 29 2020

MR.IRAQI

0 Answers Avg Quality 2/10

resolve merge conflict

Comment

git checkout develop
git merge --no-ff 'feature/imoh/issue#83_fingerprintRecognition'
git push origin develop

Popularity 10/10 Helpfulness 2/10 Language shell

Source: github.com

Tags: conflict conflic

Link to this answer
Share Copy Link

Contributed on Mar 24 2022

Repulsive Rhinoceros

0 Answers Avg Quality 2/10

CONFLICT (content): Merge conflict in

Comment

-1

CONFLICT (content): Merge conflict in bash/alx

edit the changes manually 
git add *
git stash
git pull

git merge branh-name

Popularity 10/10 Helpfulness 1/10 Language whatever

Source: Grepper

Tags: conflict conflic

Link to this answer
Share Copy Link

Contributed on Mar 01 2022

Ben Kiboma

0 Answers Avg Quality 2/10

resolve merge conflict

Comment

-1

git fetch origin
git checkout -b 'feature/imoh/issue#83_fingerprintRecognition' 'origin/feature/imoh/issue#83_fingerprintRecognition'
git merge develop

Popularity 10/10 Helpfulness 1/10 Language whatever

Source: github.com

Tags: conflict conflic

Link to this answer
Share Copy Link

Contributed on Mar 24 2022

Repulsive Rhinoceros

0 Answers Avg Quality 2/10

handling merge conflict

Contents

More Related Answers

handling merge conflict

Closely Related Answers

how to handle merge conflicts

what is merge conflict in git

resolve merge conflict

CONFLICT (content): Merge conflict in

resolve merge conflict

Grepper

Documentation

Social

Legal

Contact

Oops, You will need to install Grepper and log-in to perform this action.