Barcamp Macau 2014 - Introduction to GIT
1 like366 views
Edison Wong gave an introduction to the version control system GIT. He explained what GIT is, why it is useful for managing code changes and sharing progress with coworkers. The presentation included a 15 minute tutorial on basic GIT commands and two advanced topics: continuous integration using automated tests and GIT, and using SparkleShare for Dropbox-like file sharing with version history.
More Related Content
What's hot (20)
Viewers also liked (17)
![[HKDUG] #20160626 - HKOSCon 2015 - Website DIY with Drupal 8](https://cdn.slidesharecdn.com/ss_thumbnails/hkdug20160626-hkoscon2015-websitediywithdrupal8-150625092111-lva1-app6891-thumbnail.jpg?width=560&fit=bounds)
![[HKDUG] #20151017 - BarCamp 2015 - Drupal 8 is Coming! Are You Ready?](https://cdn.slidesharecdn.com/ss_thumbnails/hkdug20151017-barcamp2015-drupal8iscomingareyouready-151017054334-lva1-app6891-thumbnail.jpg?width=560&fit=bounds)
![[20160314][CUHK][CSCI4140]Life of an Agile Team]](https://cdn.slidesharecdn.com/ss_thumbnails/20160314cuhkcsci4140lifeofanagileteam-160315072626-thumbnail.jpg?width=560&fit=bounds)
Similar to Barcamp Macau 2014 - Introduction to GIT (20)
![[HKOSCON][20220611][AlviStack: Hong Kong Based Kubernetes Distribution]](https://cdn.slidesharecdn.com/ss_thumbnails/hkoscon20220611alvistackhongkongbasedkubernetesdistribution-220611033804-99075526-thumbnail.jpg?width=560&fit=bounds)
More from Wong Hoi Sing Edison (13)
![[HKOSCon x COSCUP 2020][20200801][Ansible: From VM to Kubernetes]](https://cdn.slidesharecdn.com/ss_thumbnails/hkosconxcoscup202020200801ansiblefromvmtokubernetes-200801021546-thumbnail.jpg?width=560&fit=bounds)
![[HKOSCON][20200613][ Ansible: From VM to Kubernetes]](https://cdn.slidesharecdn.com/ss_thumbnails/hkoscon20200613ansiblefromvmtokubernetes-200613104932-thumbnail.jpg?width=560&fit=bounds)
![[HKOSCON][20190615][DevOps with Ansible, From Native to Kubernetes]](https://cdn.slidesharecdn.com/ss_thumbnails/hkoscon20190615devopswithansiblefromnativetokubernetes-190615034740-thumbnail.jpg?width=560&fit=bounds)
![[BarCamp2018][20180915][Tips for Virtual Hosting on Kubernetes]](https://cdn.slidesharecdn.com/ss_thumbnails/barcamp201820180915tipsforvirtualhostingonkubernetes-180915064326-thumbnail.jpg?width=560&fit=bounds)
![[HKOSCON][20180616][Containerized High Availability Virtual Hosting Deploymen...](https://cdn.slidesharecdn.com/ss_thumbnails/hkoscon20180616containerizedhighavailabilityvirtualhostingdeploymentwithkubernetesdockerandansible-180616144342-thumbnail.jpg?width=560&fit=bounds)
![[HKDUG] #20180512 - Fix Hacked Drupal with GIT](https://cdn.slidesharecdn.com/ss_thumbnails/hkdug20180512-fixhackeddrupalwithgit-180512072731-thumbnail.jpg?width=560&fit=bounds)
![[HKDUG] #20161210 - BarCamp Hong Kong 2016 - What's News in PHP?](https://cdn.slidesharecdn.com/ss_thumbnails/hkdug20161210-barcamphongkong2016-whatsnewsinphp-161210060628-thumbnail.jpg?width=560&fit=bounds)
Recently uploaded (20)
Barcamp Macau 2014 - Introduction to GIT
- 1. Barcamp Macau 2014 Introduction to GIT Edison Wong 2014 Oct 4th
- 2. Edison Wong ● CEO, PantaRei Design – [email protected] ● Drupal developer & contributor – https://drupal.org/user/33940 ● HKDUG Co-founder – https://groups.drupal.org/drupalhk ● Startup founder – 2009 - PantaRei Design founded – 2010 - YBHK applicant – 2011 - ITF SERAP applicant – 2011 - HKSTP Incu-Tech applicant
- 3. PantaRei Design ● Hong Kong based Free and Open Source Software (FOSS) service provider – Content Management System (CMS) with Drupal – Cloud hosting with Amazon Web Services (AWS) – Team collaborate solution with Atlassian ● Business Partnership – 2012 - AWS Consulting Partner – 2013 - Acquia Partner – 2013 - Atlassian Experts – 2014 - Rackspace Hosting Partner ● FOSS Contributor – 2008 - Hong Kong Drupal User Group Co-founder – 2012 - Drupal Services Provider
- 7. Outline ● What is GIT? ● Why GIT? ● 15mins Tutorial ● Advanced Topic(s)
- 8. What is GIT? ● Distributed revision control and source code management (SCM) system ● Designed to handle everything from small to very large projects ● Designed and developed by Linus Torvalds for Linux kernel development in 2005
- 10. Why GIT? ● Manage code changes by rename file will soon reach its limitation, e.g. – mycode-20140308.php – mycode-201403080930.php ● Archive entire folder will make case even worse – Need to extract before compare the changes ● Share progress with co-workers become nightmare
- 11. Why GIT? (cont.) ● CVS – Manage revision per file (rename not support) – Remote repository server required (no local folder offline management) – Single commit management (other else contribute by submit patches) – TOOOOO OLD (well...) ● Used by Drupal during 7.x development cycle ● After Drupal 7 released, soon migrated to GIT
- 12. Why GIT? (cont.) ● SVN – Manage revision per folder – Remote repository server required – Single commit management – A bit better than CVS, but branching model still looks crazy ● At least, we now have GIT, why still using SVN?
- 13. Why GIT? (cont.) ● GIT – Manage revision per entire project – Remote/local repository supported ● git init ● git add --all . ● git commit -am 'Initial commit' ● git log ● git status – Distributed workflows – Used by https://drupal.org/ since Drupal 7 – You also know https://github.com/, isn't it?
- 15. 15mins Tutorial ● git init ● git status ● git add ● git rm ● git commit ● git log ● git remote ● git push ● git pull ● git diff ● git reset ● git checkout ● git branch ● git merge
- 17. Advanced Topic(s) ● Continuous Integration (CI) ● Migrate to GIT from SVN ● Dropbox-like File Sharing
- 18. Continuous Integration (CI) ● Test-Driven Development (TDD) or Behavior- Driven Development (BDD) ● Combination with automated unit tests, e.g. running phpunit per each GIT commit – GitHub → Travis CI – Stash → Bamboo
- 22. Migrate to GIT from SVN ● Prepare your environment for the migration. ● Convert the SVN repository to a local GIT repository. ● Synchronize the local GIT repository when the SVN repository changes. ● Share the GIT repository with your developers via Bitbucket. ● Migrate your development efforts from SVN to GIT.
- 24. Dropbox-like File Sharing ● Dropbox – Public cloud-based file hosting service ● GIT – Repository management with history ● SparkleShare – GIT-based file hosting solution with history – Just manage share and permission as normal GIT repository – Support public (e.g. GitHub, BitBucket) or private (e.g. Stash, GitLab) GIT repository – Suitable for small size file sharing – Dropbox-like operation, NO GIT command is required!!
- 27. Dropbox-like File Sharing (cont.) ● BitTorrent Sync – Peer-to-peer file synchronization – Over the Internet via secure, distributed P2P technology ● Unlike GIT-based solution: – Suitable for large-size binary file hosting – No complete history support ● How we use SparkleShare and BitTorrent Sync? – BitTorrent Sync: Short-term working copy sharing – SparkleShare: Long-lasting archive with history
- 30. Q&A
- 31. References ● http://git-scm.com/ ● https://try.github.io/levels/1/challenges/1 ● http://www.slideshare.net/svenpeters/getting-git-right ● https://www.atlassian.com/git/tutorials ● http://www.webupd8.org/2011/03/set-up-sparkle share-with-your-own.html ● http://www.webupd8.org/2014/03/install-bittorre nt-sync-gui-in-ubuntu.html
- 32. Thank You ● Please feel free to contact us: – Unit 207, 2/F IC Development Centre, No.6 Science Park West Avenue, Hong Kong Science Park, Shatin, N.T. – +852 3576 3812 – http://pantarei-design.com/ – [email protected]