Skip to content
This repository was archived by the owner on Dec 11, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Other/GitHub/.DS_Store
Binary file not shown.
Binary file added Other/GitHub/1_WhatWhyWelcome/.DS_Store
Binary file not shown.
10 changes: 10 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
**Type of Slide**: title slide

Title: **Github: What, Why, & Welcome**

Text:

* *Friendly Github Workshop*
* *July 2018 - Turing Institute, London, UK*

Please see first slide of presentation for images
12 changes: 12 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
**Type of Slide**: text + img

Title: Congratulations! (with party hat emoji)

Text:

* Know what is version control and GitHub
* Know the difference between Git and GitHub
* Created a new repository

Images: Please see presentation slide 10

9 changes: 9 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/11.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
**Type of Slide**: centered text

Title: Learning Objectives

Text:

* Explain the different Git/GitHub terms
* Use these commands online in GitHub

24 changes: 24 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
**Type of Slide**: text + img

Title: Git/GitHub Terms (1)

Text:

* **Repository (Repo)**

* a project where all your files are, online or on your computer

* **Commit**

* saving a version of file(s)

* >git add README.md (put > before this line)

* >git commit -m ‘My first commit’** (put > before this line)

* **Issues**

* to-do list of tasks, bugs and things you wish to accomplish

Images: Please see presentation slide 12

15 changes: 15 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/13.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
**Type of Slide**: text + img

Title: Git/GitHub Terms (2)

Text:

* **Branch**
* Copy of your project
* **Pull request**
* request to add your changes from a branch back into master
* **Merge**
* act of incorporating new changes (commits) from one branch to another

Images: Please see presentation slide 13

18 changes: 18 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/14.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
**Type of Slide**: text + img

Small Title: *Exercise*

Title: My first repo

Text:

* **https://kirstiejane.github.io/friendly-github-intro/exercises/my-first-repo/**
* Steps 4 to the end.
* Commit
* Issue
* Branch
* Pull request
* Merge

Images: Please see presentation slide 14 (some text has image with it)

18 changes: 18 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/15.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
**Type of Slide**: center img outline

Title: Congratulations! (with party hat emoji)

Text:

* Know what is
* *Commit*
* *Issue*
* *Branch*
* *Pull request*
* *Merge*
* Use these commands in a repository online in GitHub

Images: Please see presentation slide 15

Note: most text has an associated image with it (see slide 15)

17 changes: 17 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/16.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
**Type of Slide**: text + img

Title: Git/GitHub Terms (3)

Text:

* **Fork**
* make a copy of someone else repository
* **Pull request**
* request to add your changes into a forked repository
* **Clone**
* copy a repository onto your local computer
* **Download Zip**
* download the content of a repository

Images: Please see presentation slide 16

16 changes: 16 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/17.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
**Type of Slide**: center image outline

Title: N/A

Text Boxes:

* Create & manage “**Issues**”
* Your default **branch** is “master” - but you can switch or add branches here
* The “README.md” is automatically rendered when you visit a repo
* **Pull Request** to add your changes into forked repo
* **Fork** this repo
* **Clone** to your computer from the web using GitHub Desktop or git command
* **Download Zip** to download the zipped repo onto your computer

Image: Please see presentation slide 17. There are text boxes pointing to parts of the image (text above)

10 changes: 10 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/18.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
**Type of Slide**: centered text

Title: Glossary & Questions

Text:

* Don’t worry if you haven’t gotten [**all the terms**](https://raw.githubusercontent.com/datachampcam/friendly-github-intro/gh-pages/glossary.md) yet - we’ll give you time to play more and clarify any questions.

Image: Please see presentation slide 18

11 changes: 11 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/19.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**Type of Slide**: center img large

Title: n/a

Text:

* Happy Making!
* Thanks!

Image: Please see presentation slide 19 (insert image between text)

9 changes: 9 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
**Type of Slide**: side text

Title: Learning Objectives

Text:

* Define version control
* Recall why version control is crucial for research and not just for programmers
* Tell the differences between git and GitHubCreate your first GitHub Project
17 changes: 17 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
**Type of Slide**: text + img

Title: Version Control

Text:

* Management of **changes**, called **revisions** to any types of information
* Simple file versioning add v1.0, v1.1, … to filenames
* Simple tools: Google Drive, Dropbox...Advanced tools: subversion and git
* **Revision:** Change associated with a **timestamp** and the **person** making the change
* **Benefits:**
* Go back to previous versions
* Store history of changes
* Collaborate with others

Images: Please see presentation slide 3

11 changes: 11 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**Type of Slide**: left img + text

Title: Git - a Distributed Version Control System

Text:

* “Git allows groups of people to work on the same documents at the same time, and without stepping on each other's toes.”https://try.github.io/levels/1/challenges/1
* You might enjoy the git parable:http://tom.preston-werner.com/2009/05/19/the-git-parable.html

Images: Please see presentation slide 4

17 changes: 17 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
**Type of Slide**: centered text

Title: GitHub is an online service

Text:

* hosts your repositories (projects)
* helps you work with contributors/collaborators
* web interface for version control
* **Interfaces to GitHub**
* **directly online**
* **with the Github Desktop App**
* via the command line using ‘git’
* via RStudio for R fans (ask Mark about this later if you’re interested...)

Images: Please see presentation slide 5

14 changes: 14 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/6.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
**Type of Slide**: left img + text

Title: Examples of GitHub magic

Text:

* http://stat545.com/
* http://katiekowalsky.me/portfolio/
* http://rik.smith-unna.com/phd/thesis.html
* http://mozillascience.github.io/leadership-training/
* http://population.io/

Images: Please see presentation slide 6

6 changes: 6 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/7.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
**Type of Slide**: center image outline

Title: Our GitHub project

Image: Please see presentation slide 6

10 changes: 10 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
**Type of Slide**: text + img

Title: Sign-in

Text:

* https://github.com/login

Images: Please see presentation slide 8

16 changes: 16 additions & 0 deletions Other/GitHub/1_WhatWhyWelcome/9.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
**Type of Slide**: text + img

Small title: *Exercise*

Large title: My first repo



Text:

* **https://kirstiejane.github.io/friendly-github-intro/exercises/my-first-repo/**

**Steps 2 & 3.** Create a new repository.

Images: Please see presentation slide 9

Binary file not shown.
10 changes: 10 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
**Type of Slide**: title slide

Title: Collaborating with GitHub

Text:

* *Friendly Github Workshop*
* *July 2018 - Turing Institute, London, UK*

Please see first slide of presentation for images
14 changes: 14 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
**Type of Slide**: centered text

Title: \2. Fork + Pull Request

Text:

* 2. If you don’t own a repo and aren’t an official collaborator:

* you will **fork a repo** - mmm yummy
* work on your forked copy of the repo
* in order to get your changes pulled into the original repo → **make a pull request** for the changes you’ve made
* the author/owner of the original repo will determine if your changes are cool → and merge them in.
* Make friends + Big party!

4 changes: 4 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/11.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Type of Slide**: center image outline

Image: Please see presentation slide 11

4 changes: 4 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/12.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Type of Slide**: center image outline

Image: Please see presentation slide 12

4 changes: 4 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/13.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
**Type of Slide**: center image outline

Image: Please see presentation slide 13

3 changes: 3 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/14.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Type of Slide**: main point

Title: Github & Markdown
10 changes: 10 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/15.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
**Type of Slide**: text + img

Title: Markdown: what’s that?

Text:

* Markdown is a simple text “markup” language made for quickly writing formatted text - great for blogging, documentation, and even writing papers. If you can make an emoji, you can write markdown!

Images: Please see presentation slide 15

11 changes: 11 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/16.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**Type of Slide**: centered text

Title: n/a

Text:

* Markdown is important because GitHub automatically renders anything written in Markdown. This can be specific files (eg: README), or your comments on pull requests and issues.
* Some useful resources:
* https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet
* [https://www.webpagefx.com/tools/emoji-cheat-sheet](https://www.webpagefx.com/tools/emoji-cheat-sheet/)

11 changes: 11 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/17.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**Type of Slide**: centered text

Title: *Exercise: My first pull request!*

Text:

* *Work in pairs to edit a file in your partner's GitHub repository using a pull request. (And vice versa.)*
* Course website: [**https://kirstiejane.github.io/friendly-github-intro**](https://kirstiejane.github.io/friendly-github-intro)

Images: Please see presentation slide 17

3 changes: 3 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Type of Slide**: main point

Title: Two Main Workflows
12 changes: 12 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
**Type of Slide**: centered text

Title: 1. Add collaborators

Text:

* 1. As the **owner** of a repo you:

* **add** people as **collaborators**
* each collaborator can read/write files in the repo
* each collaborator is adding files and other content → making branches → and either directly merging changes in or via pull requests

8 changes: 8 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
**Type of Slide**: center image outline

Text box:

* Settings - add collaborators here

Image: Please see presentation slide 4

8 changes: 8 additions & 0 deletions Other/GitHub/2_CollaborativelyWorking/5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
**Type of Slide**: center image outline

Text box:

* Click here

Image: Please see presentation slide 5

Loading