Why Git over Subversion Why Bitbucket over GitHub Branches! EPDC case Git stash, WTF?

2. ByFelipeCeballos
Git from inQbation
experience
Welcome to inQbation KSR

3. March 14, 20143
Our team

4. March 14, 20144
Git from inQbation experience
Why Git over Subversion
Why Bitbucket over GitHub
Branches! EPDC case
Git stash, WTF?

5. March 14, 20145
Felipe Ceballos
Computer Science Engineer -
Univalle
IT Director at inQbation
Experience:
PHP (Certified Engineer-2006)
MySQL, HTML/CSS/JS (jQuery)
Linux, Drupal theming/modules,
WP theming/plugins, CVS, SVN,
Git
Dislikes:
Joomla, Social networks
Facebook:
https://www.facebook.com/inQbat
ion
Twitter:
@inQbationCo #inQbationKSR
Why Git?
- Security
- Distributed – several “origins”
- Online services: Github, Bitbucket, others
- Branches are easy, easy
- Support (Linux distributions)
- Performance
- Linus Torvalds says so!
- https://www.youtube.com/watch?v=o4PFDKIc2fs
Image src: http://hades.name/blog/2010/01/17/git-your-friend-not-foe/

6. March 14, 20146
Felipe Ceballos
Computer Science Engineer -
Univalle
IT Director at inQbation
Experience:
PHP (Certified Engineer-2006)
MySQL, HTML/CSS/JS (jQuery)
Linux, Drupal theming/modules,
WP theming/plugins, CVS, SVN,
Git
Dislikes:
Joomla, Social networks
Facebook:
https://www.facebook.com/inQbat
ion
Twitter:
@inQbationCo #inQbationKSR
Why Git?
Operations Git command SVN Command
Initial checkout from
repo
git clone svn checkout
Update locally from
repo
git fetch
git pull (fetch and
merge)
svn update
Diff locally changed
file
git diff svn diff
Blame developers git blame svn blame
Revert locally changed
file
git checkout svn revert
Revert all local
changes
git reset –hard HEAD Svn revert . R
Commit changes to
repo
git commit –m
“message”
git push
svn –ci m “message”

7. March 14, 20147
Felipe Ceballos
Computer Science Engineer -
Univalle
IT Director at inQbation
Experience:
PHP (Certified Engineer-2006)
MySQL, HTML/CSS/JS (jQuery)
Linux, Drupal theming/modules,
WP theming/plugins, CVS, SVN,
Git
Dislikes:
Joomla, Social networks
Facebook:
https://www.facebook.com/inQbat
ion
Twitter:
@inQbationCo #inQbationKSR
Licensing plan:
Number of users Vs. Number of
private repos
- Small team
- Client instances (lot of clients
;)
- Lab development
- Public repos still possible
Why Bitbucket

8. March 14, 20148
Felipe Ceballos
Computer Science Engineer -
Univalle
IT Director at inQbation
Experience:
PHP (Certified Engineer-2006)
MySQL, HTML/CSS/JS (jQuery)
Linux, Drupal theming/modules,
WP theming/plugins, CVS, SVN,
Git
Dislikes:
Joomla, Social networks
Facebook:
https://www.facebook.com/inQbat
ion
Twitter:
@inQbationCo #inQbationKSR
Branches – EPDC case
study
git branch
git merge
git checkout
Image src: http://erickryski.com/2012/06/01/my-git-branching-strategy/

9. March 14, 20149
Felipe Ceballos
Computer Science Engineer -
Univalle
IT Director at inQbation
Experience:
PHP (Certified Engineer-2006)
MySQL, HTML/CSS/JS (jQuery)
Linux, Drupal theming/modules,
WP theming/plugins, CVS, SVN,
Git
Dislikes:
Joomla, Social networks
Facebook:
https://www.facebook.com/inQbat
ion
Twitter:
@inQbationCo #inQbationKSR
- Messing things up?
- Need to switch back before
committing? (fixes)
- Want to derive work from
working copy and leave it
untouched?
Git Stash

10. March 14, 201410
Thanks for
your attention