Answers for "what is merge conflict in git"

3

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

what is merge conflict in git

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
Posted by: Guest on January-29-2020

Code answers related to "Shell/Bash"

Browse Popular Code Answers by Language