Horje
resolve merge conflict Code Example
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
git Automatic merge failed; fix conflicts and then commit the result
$ git status

$ git add .

$ git commit -a "Comment"
resolve merge conflict
git checkout develop
git merge --no-ff 'feature/imoh/issue#83_fingerprintRecognition'
git push origin develop
Source: github.com
resolve merge conflict
git fetch origin
git checkout -b 'feature/imoh/issue#83_fingerprintRecognition' 'origin/feature/imoh/issue#83_fingerprintRecognition'
git merge develop
Source: github.com




Shell

Related
destroy linux with one command Code Example destroy linux with one command Code Example
install node arch linux Code Example install node arch linux Code Example
read all test in directory golang Code Example read all test in directory golang Code Example
TypeError: Could not load reporter "mochawesome" Code Example TypeError: Could not load reporter "mochawesome" Code Example
how to install diskpart in ubuntu Code Example how to install diskpart in ubuntu Code Example

Type:
Code Example
Category:
Coding
Sub Category:
Code Example
Uploaded by:
Admin
Views:
9