Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.

Git Workshop

1,253 views

Published on

Published in: Technology
  • Be the first to comment

  • Be the first to like this

Git Workshop

  1. 1. Introduction to Git Sean Cashin Socialcast
  2. 2. <ul>Developer Bob working on integrating in with a new service </ul>Does this sound familiar?
  3. 4. Manager Jim found a show stopper bug and needs Developer Bob to fix it ASAP
  4. 5. What to do <ul>Git <li>git stash
  5. 6. git checkout master
  6. 7. Fix the problem
  7. 8. git commit
  8. 9. git checkout <branch>
  9. 10. git stash apply </li></ul><ul>SVN <li>Try to find someone else who has a cleaner working copy
  10. 11. Commit changes
  11. 12. Find the bug, implement a fix, manually pull out your changes, push to trunk, and finally try to remember all the fixes you just reversed. </li></ul>
  12. 13. Git enables a developer to follow a more agile development style
  13. 14. Distributed Version Control System Originally made for development on Linux History
  14. 15. Integrating with SVN <ul>git-svn: “ Bidirectional operation between a single Subversion branch and git ” <li>Uses the Subversion repository as the central storage among developers
  15. 16. Each developer can use their local git repo
  16. 17. git svn clone https://longhouse.googlecode.com/svn/trunk longhouse --username=scashin133 </li></ul>
  17. 18. Developing with Git <ul><li>Small commits
  18. 19. Branched features
  19. 20. Easy testing
  20. 21. More time for code, less for managing it </li></ul>
  21. 22. Helpful Tools & Resources <ul><li>Git manual (http://www.kernel.org/pub/software/scm/git/docs/user-manual.html)
  22. 23. git_remote_branch (http://grb.rubyforge.org/): Rubygem that makes it easy to do remote branch management
  23. 24. git-auto-complete ( http://gist.github.com/212013 ): bash script for doing tab completion with git branches
  24. 25. git-bash-prompt ( http://gist.github.com/212016 ): bash script for showing additional information in shell
  25. 26. rake git:* ( http://gist.github.com/212022 ): Used for management of code releases in Socialcast. </li></ul>
  26. 27. <ul><li>SVN to Github: http://github.com/blog/156-subversion-importing </li></ul>
  27. 28. Questions?

×