Being a Git

Talk given at MWUG re Git

Transcript

1. www.reasondigital.com @miss_jwo
2. www.reasondigital.com @miss_jwo Being a Git Jenny Wong Web Developer

3. www.reasondigital.com @miss_jwo Jenny Wong Web Developer PHPNW usergroup & conference organiser @miss_jwo

4. www.reasondigital.com @miss_jwo True Story
5. www.reasondigital.com @miss_jwo Version Control
6. www.reasondigital.com @miss_jwo wikipedia.org/wiki/Revision_control Version control is the ! management of changes ! to documents, computer programs, large web sites, and other collections of information.
7. www.reasondigital.com @miss_jwo commonly refers to a storage location, often for safety or preservation. ! Default: origin Repository (repo)
8. www.reasondigital.com @miss_jwo Different Forms
9. www.reasondigital.com @miss_jwo
10. www.reasondigital.com @miss_jwo Centralised (e.g Subversion a.k.a. SVN)
11. www.reasondigital.com @miss_jwo
12. www.reasondigital.com @miss_jwo ! 1 point of failure
13. www.reasondigital.com @miss_jwo
14. www.reasondigital.com @miss_jwo Distributed (e.g Git & Mercurial)
15. www.reasondigital.com @miss_jwo
16. www.reasondigital.com @miss_jwo ! 1 point of failure
17. www.reasondigital.com @miss_jwo What about Github?
18. www.reasondigital.com @miss_jwo Github != Git
19. www.reasondigital.com @miss_jwo Github Internet based git service
20. www.reasondigital.com @miss_jwo ! With Github
21. www.reasondigital.com @miss_jwo Whats with the name?
22. www.reasondigital.com @miss_jwo “ I’m an egotistical bastard, and I name all my projects after myself. First Linux, now git. ” Linus Torvalds
23. www.reasondigital.com @miss_jwo How do we use Git?
24. www.reasondigital.com @miss_jwo 1. Create a new project 2. Add files to the project 3. Check what changes have happened 4. Write a comment saying where the project is up to ! ! Scenario: New Project on your own machine.
25. www.reasondigital.com @miss_jwo 1. Create a new project create a directory on your machine
26. www.reasondigital.com @miss_jwo 1. Create a new project create a directory on your machine MWUG
27. www.reasondigital.com @miss_jwo 1. Create a new project create a directory on your machine git init MWUG
28. www.reasondigital.com @miss_jwo
29. www.reasondigital.com @miss_jwo 2. Add files to the project MWUG
30. www.reasondigital.com @miss_jwo 2. Add files to the project create a file inside the MWUG repo MWUG
31. www.reasondigital.com @miss_jwo 2. Add files to the project create a file inside the MWUG repo git add fileName MWUG
32. www.reasondigital.com @miss_jwo 2. Add files to the project create a file inside the MWUG repo git add fileName MWUG git add -a
33. www.reasondigital.com @miss_jwo 2. Add files to the project create a file inside the MWUG repo git add fileName MWUG git add -a Pay attention to changes in this file {
34. www.reasondigital.com @miss_jwo
35. www.reasondigital.com @miss_jwo 3. Check what changes have happened git status MWUG What has changed? {
36. www.reasondigital.com @miss_jwo
37. www.reasondigital.com @miss_jwo 4. Write a comment saying where the project is up to git commit MWUG “Changed body background to yellow” { Log File }
38. www.reasondigital.com @miss_jwo
39. www.reasondigital.com @miss_jwo A duplication of the project within the same repository. Enables the ability of code changes to be self contained. ! Default: Master Branch
40. www.reasondigital.com @miss_jwo 1. Make a version of the project 2. Make changes the project 3. Client agrees to the changes 4. Copy the changes to the master copy of the site ! ! Scenario: Client wants multiple extra features
41. www.reasondigital.com @miss_jwo 1. Create a version of the project create a branch for the new feature MWUG
42. www.reasondigital.com @miss_jwo 1. Create a version of the project create a branch for the new feature MWUG master { default
43. www.reasondigital.com @miss_jwo 1. Create a version of the project create a branch for the new feature git checkout -b newFeature MWUG newFeature master { default
44. www.reasondigital.com @miss_jwo 2. Make changes the project newFeature
45. www.reasondigital.com @miss_jwo 2. Make changes the project newFeature
46. www.reasondigital.com @miss_jwo 3. Client is happy newFeature
47. www.reasondigital.com @miss_jwo 4. Copy the changes to the master copy of the site newFeature master feature1 feature2
48. www.reasondigital.com @miss_jwo 4. Copy the changes to the master copy of the site git checkout master git merge newFeature newFeature master feature1 feature2 Go to location you want the changes Copy in the changes from newFeature branch {
49. www.reasondigital.com @miss_jwo What about changes in Master? newFeature master feature1 feature2
50. www.reasondigital.com @miss_jwo What about changes in Master? newFeature master feature1 feature2 git checkout newFeature git merge Master Go to location you want the changes Copy in the changes from Master branch {
51. www.reasondigital.com @miss_jwo The action of duplicating a repository in it’s entirety at a certain point in time. Fork / Clone a project
52. www.reasondigital.com @miss_jwo Location of copy of project ! Default: origin Remote
53. www.reasondigital.com @miss_jwo 1. Get a copy of project 2. Make changes on the project 3. Make a note of changes 4. Send a copy of the changes back to original machine ! ! Scenario: Work on a different machine
54. www.reasondigital.com @miss_jwo Photocopy of the project from a particular location MWUG @ Origin 1. Get a copy of project
55. www.reasondigital.com @miss_jwo Photocopy of the project from a particular location MWUG @ Origin MWUG @ HomePC git clone originLocation/MWUG /MWUG 1. Get a copy of project
56. www.reasondigital.com @miss_jwo Select which branch of the repo you want to work on { MWUG @ HomePC 2. Make changes on the project
57. www.reasondigital.com @miss_jwo Select which branch of the repo you want to work on { MWUG @ HomePC git checkout newFeature 2. Make changes on the project
58. www.reasondigital.com @miss_jwo Select which branch of the repo you want to work on { MWUG @ HomePC git checkout newFeature 2. Make changes on the project
59. www.reasondigital.com @miss_jwo Logging what you have done on this branch { MWUG @ HomePC 3. Make a note of changes
60. www.reasondigital.com @miss_jwo Logging what you have done on this branch { MWUG @ HomePC git commit 3. Make a note of changes
61. www.reasondigital.com @miss_jwo Send changes to different remote { MWUG @ Origin 4. Send a copy of the changes back to original machine MWUG @ HomePC
62. www.reasondigital.com @miss_jwo Send changes to different remote { MWUG @ Origin git push origin newFeature 4. Send a copy of the changes back to original machine MWUG @ HomePC
63. www.reasondigital.com @miss_jwo Bring in changes from different remote { MWUG @ Origin What about changes on the original machine? MWUG @ HomePC
64. www.reasondigital.com @miss_jwo Bring in changes from different remote { MWUG @ Origin git pull origin newFeature What about changes on the original machine? MWUG @ HomePC
65. www.reasondigital.com @miss_jwo Do I have to use the command line?
66. www.reasondigital.com @miss_jwo www.sourcetreeapp.com
67. www.reasondigital.com @miss_jwo Installation
68. www.reasondigital.com @miss_jwo http://git-scm.com/book/en/ Getting-Started-Installing-Git Installation Guide:
69. www.reasondigital.com @miss_jwo Glossary
70. www.reasondigital.com @miss_jwo Repository (repo) Name of the project
71. www.reasondigital.com @miss_jwo Remote Location of project copy Default : Origin
72. www.reasondigital.com @miss_jwo Branch A version of the project Default : Master
73. www.reasondigital.com @miss_jwo Commands
74. www.reasondigital.com @miss_jwo init clone add commit status push pull checkout log stash revert merge
75. www.reasondigital.com @miss_jwo Questions?
76. www.reasondigital.com @miss_jwo @miss_jwo mwug@jwong.co.uk Ask me later: (Feedback would be awesome) t: e: