Answers for "resolve conflict github merge"

Shell/Bash

5

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

Code answers related to "resolve conflict github merge"

Code answers related to "Shell/Bash"

Browse Popular Code Answers by Language

Python

Javascript

Whatever

Shell/Bash

CSS

Html

PHP

SQL

Java

C#