Answers for "conflict (content): merge conflict in 0x01-git/bash/alx automatic merge failed; fix conflicts and then commit the result."

6

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

git Automatic merge failed; fix conflicts and then commit the result

$ git status

$ git add .

$ git commit -a "Comment"
Posted by: Guest on July-13-2020

Code answers related to "conflict (content): merge conflict in 0x01-git/bash/alx automatic merge failed; fix conflicts and then commit the result."

Code answers related to "Shell/Bash"

Browse Popular Code Answers by Language