Working with others using Git and GitHub

The basics of using Git and GitHub to collaborate on a multi-person software project. Presented to students at The University of Edinburgh in 2018.

Transcript

1. Working with others using and @MikeMcQuaid
2. Mike McQuaid Senior Engineer at GitHub https://github.com/MikeMcQuaid
3. @MikeMcQuaid mike@mikemcquaid.com https://mikemcquaid.com
4. why version control?
5. https://github.com/GitInPractice/GitInPractice/blob/master/ D-WhyUseVersionControl.adoc#handling-changes
6. https://github.com/GitInPractice/GitInPractice/blob/master/ D-WhyUseVersionControl.adoc#handling-changes
7. https://github.com/GitInPractice/GitInPractice/blob/master/ D-WhyUseVersionControl.adoc#version-control-workflow
8. https://github.com/GitInPractice/GitInPractice/blob/master/D- WhyUseVersionControl.adoc#version-control-for-programmer-collaboration
9. GitHub
10. https://github.com/join
11. https://education.github.com/pack
12. https://github.com/new
13. clone
14. https://github.com/MikeMcQuaid/strap
15. $ git clone https://github.com/MikeMcQuaid/strap Cloning into 'strap'... remote: Counting objects: 655, done. remote: Total 655 (delta 0), reused 0 (delta 0), pack-reused 655 Receiving objects: 100% (655/655), 142.85 KiB | 870.00 KiB/s, done. Resolving deltas: 100% (325/325), done.
16. branch
17. $ git branch * master
18. $ git branch testing
19. $ git branch * master testing
20. $ git checkout testing Switched to branch 'testing'
21. $ git branch master * testing
22. commit
23. https://github.com/GitInPractice/GitInPractice/blob/master/ D-WhyUseVersionControl.adoc#version-control-workflow
24. https://github.com/GitInPractice/GitInPractice/blob/master/01- LocalGit.adoc#creating-a-new-commit-git-add-git-commit
25. $ git status On branch testing Untracked files: (use "git add <file>..." to include in what will be committed) testing.txt nothing added to commit but untracked files present (use "git add" to track)
26. $ git add testing.txt
27. $ git status On branch testing Changes to be committed: (use "git reset HEAD <file>..." to unstage) new file: testing.txt
28. $ git commit -m "add test plan" [testing 82b9fdf] add test plan 1 file changed, 1 insertion(+) create mode 100644 testing.txt
29. push
30. $ git push fatal: The current branch testing has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin testing
31. $ git push --set-upstream origin testing Counting objects: 3, done. Delta compression using up to 8 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 281 bytes | 281.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0) remote: Resolving deltas: 100% (1/1), completed with 1 local object. To https://github.com/MikeMcQuaid/strap * [new branch] testing -> testing Branch 'testing' set up to track remote branch 'testing' from 'origin'.
32. $ git push Everything up-to-date
33. pull request
36. https://github.com/MikeMcQuaid/strap/pull/139
37. https://github.com/MikeMcQuaid/strap/pull/139/files
40. merge
41. https://github.com/MikeMcQuaid/strap/pull/125
42. pull
43. $ git fetch remote: Counting objects: 1, done. remote: Total 1 (delta 0), reused 1 (delta 0), pack-reused 0 Unpacking objects: 100% (1/1), done. From https://github.com/Homebrew/homebrew-php 213dbf0d..6ec9064d master -> origin/master
44. git pull = git fetch && git merge
45. git pull --rebase = git fetch && git rebase
46. $ git pull remote: Counting objects: 31, done. remote: Compressing objects: 100% (3/3), done. remote: Total 31 (delta 22), reused 25 (delta 22), pack-reused 6 Unpacking objects: 100% (31/31), done. From https://github.com/Homebrew/homebrew-core c62c972697..2e9eb43456 master -> origin/master Updating c62c972697..2e9eb43456 Fast-forward Formula/app-engine-go-64.rb | 4 ++-- Formula/irssi.rb | 10 +++++----- Formula/mpir.rb | 44 ++++++++++++++++++++++++++++++++++ Formula/nordugrid-arc.rb | 2 +- Formula/phantomjs.rb | 4 ++-- 5 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 Formula/mpir.rb
47. repeat
48. help
49. $ git help diff $ git diff --help
50. https://github.com/GitInPractice/GitInPractice
51. http://mikemcquaid.com/talks/advanced-git-and-github/
52. @MikeMcQuaid mike@mikemcquaid.com https://mikemcquaid.com
53. questions?