Git vol 2

781 views

Published on

A follow up presentation on git with some common problems and a detailed walk through the git workflow.

Published in: Technology
0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
781
On SlideShare
0
From Embeds
0
Number of Embeds
4
Actions
Shares
0
Downloads
8
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Git vol 2

  1. 1. •••
  2. 2. git branch task1
  3. 3. git checkout task1
  4. 4. file...
  5. 5. git add file file ...
  6. 6. git commit
  7. 7. git addgit commit
  8. 8. git checkout master git merge task1
  9. 9. git fetch origin
  10. 10. git push origin master
  11. 11. git fetch
  12. 12. git merge origin/master
  13. 13. git push origin master
  14. 14. git push origin task1
  15. 15. git fetch origin
  16. 16. git checkout –t origin/task1
  17. 17. •• <<<<<<< HEAD some code =======• some other code >>>>>>> change-branch git merge –s ours
  18. 18. ••••

×