git vol 2
DESCRIPTION
A follow up presentation on git with some common problems and a detailed walk through the git workflow.TRANSCRIPT
•
•
•
git branch task1
git checkout task1
file
...
file
...
git add file
git commit
git add
git commit
git checkout master
git merge task1
git fetch origin
git push origin master
git fetch
git merge origin/master
git push origin master
git push origin task1
git fetch origin
git checkout –t origin/task1
•
•
•
<<<<<<< HEAD
some code
=======
some other code
>>>>>>> change-branch
git merge –s ours
•
•
•
•
