Collaborating with Git and GitHub - Girl Develop It Central VA

Slides for the Git/GitHub workshop for Girl Develop It Central VA

Transcript

1. Collaborating with git and GitHub Happy Hacktoberfest!
2. Set up 4 Create a GitHub account 4 Install and set up git https://help.github.com/articles/set-up-git/ 4 In Terminal or Powershell: cd ~ mkdir projects cd projects
3. Welcome! Girl Develop It is here to provide affordable and accessible programs to learn software through mentorship and hands-on instruction.
4. Some "rules" 4 We are here for you! 4 Every question is important 4 Help each other 4 Have fun
5. Welcome! 4 Who are you? 4 Last meal you made? 4 OPTIONAL: What drew you to take this class?
6. Collaborating with git and GitHub 4 Distributed version control 4 GitHub 4 Hands-on
7. git 4 Version control 4 Code provenance
8. Like infinite save games!!!
10. And each save point tells a story
11. git is Collaborative
12. git is Distributed
13. Centralized vs. Distributed
14. Centralized
15. Centralized (svn) 4 Everybody works on same copy of project 4 Saving and sharing happen in the same step
17. Distributed (git)
18. Distributed VCS (git) 4 Everybody gets a copy 4 Sync when you want to (merge copies) 4 Separates saving from sharing 4 Bonus: Lots of backups
19. GitHub
20. GitHub Where projects and their histories ("repos") are stored
21. https://github.com/GirlDevelopItCentralVA/gdi- centralva-directory
22. Workflow
24. Fork Make your copy on GitHub https://github.com/GirlDevelopItCentralVA/gdi- centralva-directory
26. Clone Download your copy from GitHub to your computer
28. $ git clone https://github.com/sloria/gdi-centralva-directory.git $ cd gdi-centralva-directory
30. Remotes
31. Remotes remote = name for a copy on GitHub Example: "origin" is the name of the repo you cloned from
32. List your remotes $ git remote -v origin https://github.com/sloria/gdi-centralva-directory.git (fetch) origin https://github.com/sloria/gdi-centralva-directory.git (push)
33. Remotes By convention: 4 "origin" = Your fork (sloria/gdi-centralva-directory) 4 "upstream" = The original version (GirlDevelopItCentralVA/gdi-centralva-directory)
34. Add a remote Add "upstream" as a remote
36. $ git remote add upstream https://github.com/GirlDevelopItCentralVA/gdi-centralva-directory.git
37. $ git remote -v origin https://github.com/sloria/gdi-centralva-directory.git (fetch) origin https://github.com/sloria/gdi-centralva-directory.git (push) upstream https://github.com/GirlDevelopItCentralVA/gdi-centralva-directory.git (fetch) upstream https://github.com/GirlDevelopItCentralVA/gdi-centralva-directory.git (push)
39. Branches
40. A branch is a storyline
41. A branch is a storyline Example branch names: "fix-ui-bug", "add-more-docs"
42. List your branches $ git branch * master
43. Create a branch $ git branch add-steve-json
44. $ git branch add-steve-json * master
45. Switch branches $ git checkout add-steve-json $ git branch * add-steve-json master
46. Add a File people/steve-loria.json { "name": "Steve Loria", }
47. See changed/added files
48. Stage the file Add file(s) that we want to save $ git add .
50. Commit Save your changes git commit -m "Add my info"
52. Make more changes people/steve-loria.json { "name": "Steve Loria", "twitter": "sloria1", "github": "sloria", "personal": "https://stevenloria.com" }
53. Review your changes
55. Stage the file Add the file $ git add .
57. Commit Save your changes git commit -m "Add more of my info"
58. View Commit Logs $ git log
60. Push to your Fork Get your local changes onto your fork on GitHub $ git push origin add-steve-json
61. On your fork on GitHub...
62. Send a Pull Request Request that your changes get incorporated
64. Pulling upstream changes Sync your local repo with other people's changes $ git pull upstream master
66. Use git for everything
67. Git is not just for code Writing, data, design projects
68. Use git when you care about history
69. Use git for everything
70. Happy Hacktoberfest!