webinar: arbeiten mit git und github
DESCRIPTION
Hier werden vor allem diese Themen behandelt: Vorteile der Arbeit mit einer Versionsverwaltung; die wichtigsten Features von Git (auch im Unterschied z.B. zu Subversion); die Benutzung der GitHub-Plattform; Demonstration: Arbeiten mit Git und GitHubTRANSCRIPT
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
WebinarWorking with Git and GitHub
March 19th
Joscha Krug Marco Steinhäuser Dr. Roman ZennerCEO Community Guide Geschäftsführermarmalade GmbH OXID eSales AG wasmitweb GmbH
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
> Advantages working with a version control system> Most important features of GIT (in comparison to SVN)> Usage of GitHub> Working with GIT and GitHub
What is it about?
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
> Community Guide at OXID eSales> A “Community what?” → another presentation ;)> http://about.me/marco.steinhaeuser
Marco Steinhäuser
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
> VCS = abbr. for Version Control System> Versioning without the need of a file copy> Rollback is possible> Diff between different versions> Distributed work on one project> One central storage area
Advantages working with a VCS
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
● Lean, lank and faster than CVS (ancient) and SVN● Distributed working on projects towards single files● Difference between commit & push● Repo file formats are simple, so repair is easy and corruption rare
BUT:● Subversion clients more mature than for GIT● Revision numbers are much more simple in SVN whereas GIT uses
SHA-1 hashes
Advantages using GIT
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
> Already many developers working with it> Social components (e.g. follow others)> Simple contributions possible via forking feature without prior agreement> Good documentation and help
Advantages using GitHub
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
GUI or terminal?
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
Principles of Pull Requests
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
1. Fork from the origin of the project!2. Press the fork button3. Enjoy!
How to contribute: 1. Fork!
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
$ git clone [URI of the repo.git]$ git add [/folder/file.php](on file level only, doesn't work for empty folders → index.html)
$ git diff [?]$ git commit -m “[text]”(locally only, in difference to SVN)
$ git push -remote [origin] -branch [master]
How to contribute: 2. Commands
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: 2. Commands - git clone
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: 2. Commands - git clone
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: make your changes
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: 2. Commands - git add
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: 2. Commands - git commit
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: 2. Commands - git push
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: check on GitHub
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
1. Press the Pull Request button in your forked repository2. Send the pull request to the original repo, describe what you did and what your change is about.
How to contribute: 3. Pull Request
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
How to contribute: 3. Pull Request
© 2013 OXID eSales AGCopyright marmalade GmbH & OXID eSales AG
Thank you!
Joscha Krugmarmalade GmbHGitHub: jkrug
Marco SteinhäuserOXID eSales AGGitHub: kermie
Dr. Roman Zennerwasmitweb GmbHGitHub: ???