Software Version Control with Git and Github

An introductory presentation about github, one that tells the tale of a markup feature, and a Code Wookie Intern

Transcript

1. SOFTWARE VERSION CONTROL with Git and Github
2. What is Version Control •  Revision control, also known as version control and source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. •  Changes are usually identified by a number or letter code, termed the "revision number", "revision level", or simply "revision". •  Each revision is associated with a timestamp and the person making the change.
3. History of Version Control Generation Networking Operations Concurrency Examples First None One file at a time Locks RCS, SCCS Second Centralized Multi-file Merge before commit CVS, SourceSafe, Subversion, Team Foundation Server Third Distributed Changesets Commit before merge Bazaar, Git, Mercurial
4. What is Git? •  Designed by Linus Torvalds •  2005 •  Linux •  Distributed
5. What is Github? •  Software as a Service for git •  Built by some Ruby guys, have since added some Erlang •  Online Social Coding / Open Source •  Enterprise
6. Definitions • Code Repository •  a place where large amounts of source code are kept, either publicly or privately •  This code is usually stored on a centralized server •  “repo” for short
7. Definitions • Commit •  To commit is to write or merge the changes made in the working copy back to the repository. •  Kind of like hitting the “save” button in a text editor, but for your code repo
8. Definitions • Push •  when you want to give your commit changes to another remote repo • Pull/Fetch •  when you want to merge in someone else’s changes on the same branch
9. Definitions • Branch •  Separate “timeline” of code •  Keep a feature’s development different from the main code line. •  “release/staging branch” – testing before moved into production
10. Definitions • Merge •  When you have to bring in a set of external changes into your code base. •  This could be if you and another programmer are working on the same code. If they make a commit, you will need to merge that change in before.
12. Now, this is the story all about how. My life got flipped-turned upside down... By github…
14. Configuration… •  Git config •  git config --global user.name "YOUR NAME” •  git config --global user.email "YOUR EMAIL ADDRESS” •  SSH keys •  Public/Private key that lets github know you are really you •  https://help.github.com/articles/generating-ssh-keys/
18. First Steps •  mkdir code/tripping-tribble •  echo "# tripping-tribble" >> README.md •  git init •  => Initialized empty Git repository in /Users/taelor/code/tripping-tribble.git/
19. First Steps •  git add README.md •  git commit -m "first commit” •  => [master (root-commit) a1f0bbd] first commit •  1 file changed, 1 insertion(+) •  create mode 100644 README.md
20. First Steps •  git remote add origin git@github.com:taelor/tripping-tribble.git •  git push -u origin master •  => Counting objects: 3, done. •  Writing objects: 100% (3/3), 232 bytes | 0 bytes/s, done. •  Total 3 (delta 0), reused 0 (delta 0) •  To git@github.com:taelor/tripping-tribble.git •  * [new branch] master -> master •  Branch master set up to track remote branch master from origin.
78. A successful Git branching model http://nvie.com/posts/a-successful-git-branching-model/
80. Someone asked about Deployment? $ git push heroku master
82. $ git push heroku master Remote Repository
83. Hooks with Github
87. https://github.com/jimweirich/wyriki/commit/d28fac7f18aeacb00d8ad3460a0a5a901617c2d4 Last Commit
91. Thanks