From 2bd6e4e71c30831133a163f4ae0f7f347a599594 Mon Sep 17 00:00:00 2001
From: joeyklee
Date: Mon, 7 Mar 2016 23:02:10 -0800
Subject: [PATCH 01/99] added guides to link
---
index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/index.html b/index.html
index 52eb2c3..1ca554e 100644
--- a/index.html
+++ b/index.html
@@ -66,7 +66,7 @@
Sessions
GitHub Essentials: Getting Started with Github - in this exercise, you will work through the basic GitHub worflow using GitHub Online and GitHub Desktop.
From 6a07f3c1fb5d4f9af47d0979f4ced5650acf6921 Mon Sep 17 00:00:00 2001
From: joeyklee
Date: Mon, 7 Mar 2016 23:19:56 -0800
Subject: [PATCH 02/99] updated gitignore
---
.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 6f66c74..15653ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-*.zip
\ No newline at end of file
+*.zip
+private/*
\ No newline at end of file
From a921c7e9dd7e75810da4bdab957ecc0ba99fc3b7 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:09:17 +0100
Subject: [PATCH 03/99] Changed date
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ab966ee..fbed601 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
***
-We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-02-08-friendly-github-intro) for the workshop here - Github Workshop, March 8th, 2016.
+We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop here - Github Workshop, July 22nd, 2016.
***
# A Friendly Github Introduction
From fda90c8782f3266a42c2e23faf97920ed7989fc6 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:10:28 +0100
Subject: [PATCH 04/99] Changed date
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b2797f4..20c1ae8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
❤️
***
-We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-02-08-friendly-github-intro) for the workshop here - Github Workshop, March 8th, 2016.
+We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop here - Github Workshop, July 22nd, 2016.
***
# A Friendly Github Introduction
From 8fd27f19ec6f88e6d49ce07cf5558293a2461f89 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:30:29 +0100
Subject: [PATCH 05/99] Update README.md
---
README.md | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 20c1ae8..63eed05 100644
--- a/README.md
+++ b/README.md
@@ -4,29 +4,31 @@
We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop here - Github Workshop, July 22nd, 2016.
***
-# A Friendly Github Introduction
-This is a friendly introduction to making open, version-controlled, and collaborative projects using Github.
-
-You are invited to fork this repo and use our materials-- please let us know what you do with them and how it goes!
+# Beginners guide to version control with git
+This is a beginner friendly introduction to making open, version-controlled, and collaborative projects using git and GitHub.
## About
-This is a friendly introduction to Github – a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the Github ecosystem and help you get you comfortable navigating basic Github workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on Github (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how Github can help make your projects more readable and accessible. This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritized.
+**Description**: Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
+
+Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
+
+This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. You don't have to share your work with others or collaborate with anyone, although you'll learn how this can be achieved with ease.
+
+This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritised.
## Learning Objectives & Takeaways
At the end of the workshop, we hope you will feel acquainted and/or comfortable with:
* Github as:
- * social platform - collaboration, coordination, and contributing
+ * Social platform - collaboration, coordination, and contributing
* Time machine - track project and go back
- * documentation & sharing platform
- * project development platform
+ * Documentation & sharing platform
+ * Project development platform
* Basic Github Workflows:
- * working individually with commits, issues, branching, and merging
- * working collaboratively with issues, forking & pull requests
-
-
+ * Working individually with commits, issues, branching, and merging using git
+ * Working collaboratively with issues, forking & pull requests
## Why are we teaching GitHub?
@@ -34,10 +36,11 @@ Git/GitHub can enable projects of any size (from individuals up to organizations
At the Mozilla Science Lab, we use GitHub as a platform to share knowledge, build communities, and make science as open and accessible as possible. We hope you will use GitHub as well to make better projects.
-###What is "open" research?
-Whether you're studying the human genome, black holes, deep sea ecology, medieval music, or alternative energy sources, research is a practice and process of learning, and creating knowledge. Researchers always build on (or transform) an existing understanding of the world. **A researcher working open shares insights or discoveries freely, makes her data available on the web, or makes the details of a new experimental technique or tool public so others can use and reuse it. By working open, she empowers fellow researchers and furthers our collective knowledge... knowledge that can be used to solve problems, save lives, and inspire and amaze us all.** The more data, knowledge, methods, tools and skills made widely and openly available to all, the better.
+### What is "open" research?
+
+Whether you're studying the human genome, black holes, deep sea ecology, medieval music, or alternative energy sources, research is a practice and process of learning, and creating knowledge. Researchers always build on (or transform) an existing understanding of the world. **A researcher working open shares insights or discoveries freely, makes her data available on the web, or makes the details of a new experimental technique or tool public so others can use and reuse it. By working open, she empowers fellow researchers and furthers our collective knowledge... knowledge that can be used to solve problems, save lives, and inspire and amaze us all.** The more data, knowledge, methods, tools and skills made widely and openly available to all, the better.
-###Oh, by the way, what's Mozilla Science Lab??
+### What's Mozilla Science Lab??
At [Mozilla Science Lab](https://mozillascience.org/) we help scientists and researchers (anyone from students to established researchers to citizen scientists) to work openly and do better research, more research, and make that research more useful by sharing it widely.
We provide various types of trainings (such as this Workshop), learning materials and formats (such as [Mozilla Study Groups](http://mozillascience.github.io/studyGroupHandbook/)), platforms for sharing and showcasing open Science projects (such as [MSL Collaborate](https://mozillascience.org/collaborate)), and support for leaders in open science (through the [Mozilla Fellows for Science](https://mozillascience.org/fellows).
From 858bf8b63722e0b65910d8ad95d38f5593051080 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:31:26 +0100
Subject: [PATCH 06/99] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 63eed05..17502ff 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
❤️
***
-We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop here - Github Workshop, July 22nd, 2016.
+We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop on July 22nd, 2016.
***
# Beginners guide to version control with git
From d14b7bd68f9f7e72b474368de69c03d3c5a8524f Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:34:11 +0100
Subject: [PATCH 07/99] Update humans.md
---
humans.md | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/humans.md b/humans.md
index a6299be..a5e261f 100644
--- a/humans.md
+++ b/humans.md
@@ -1,19 +1,13 @@
# All the lovely people involved in making this happen
-## Mozilla Science Lab
+## Facilitators
-* Joey Lee
-* Steph Wright
-
-## Facilitator
+* Kirstie Whitaker
+* Mark Dunning
-* [Matt Strimas-Mackay](http://strimas.com/)
-* [Will Hall](http://socialidentitylab.psych.ubc.ca/person/will-hall/)
+## Mozilla Science Lab Fellows
-## UBC
-
-* Kelly Schultz
-* Erin Fields
-* Susan Atkey
-* CTLT
+The workshop was originally developed by
+* Joey Lee
+* Steph Wright
From 730f0103443898299fa62faa9a807cd5839b4511 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:47:09 +0100
Subject: [PATCH 08/99] Update humans.md
---
humans.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/humans.md b/humans.md
index a6299be..c4b35a7 100644
--- a/humans.md
+++ b/humans.md
@@ -1,5 +1,12 @@
# All the lovely people involved in making this happen
+## Facilitators
+
+* Kirstie Whitaker
+* A. Pajon
+* Gordon Brown
+* Mark Dunning
+
## Mozilla Science Lab
* Joey Lee
From afeb7fefeae30c364303e5ce0f456fd4869b65ad Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:47:42 +0100
Subject: [PATCH 09/99] updated humans.md
---
humans.md | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/humans.md b/humans.md
index a6299be..a5e261f 100644
--- a/humans.md
+++ b/humans.md
@@ -1,19 +1,13 @@
# All the lovely people involved in making this happen
-## Mozilla Science Lab
+## Facilitators
-* Joey Lee
-* Steph Wright
-
-## Facilitator
+* Kirstie Whitaker
+* Mark Dunning
-* [Matt Strimas-Mackay](http://strimas.com/)
-* [Will Hall](http://socialidentitylab.psych.ubc.ca/person/will-hall/)
+## Mozilla Science Lab Fellows
-## UBC
-
-* Kelly Schultz
-* Erin Fields
-* Susan Atkey
-* CTLT
+The workshop was originally developed by
+* Joey Lee
+* Steph Wright
From 6debef0f8428ec51db2f92b8cd8523487b130a5d Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:55:50 +0100
Subject: [PATCH 10/99] added humans.md
---
humans.md | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 humans.md
diff --git a/humans.md b/humans.md
new file mode 100644
index 0000000..a5e261f
--- /dev/null
+++ b/humans.md
@@ -0,0 +1,13 @@
+# All the lovely people involved in making this happen
+
+## Facilitators
+
+* Kirstie Whitaker
+* Mark Dunning
+
+## Mozilla Science Lab Fellows
+
+The workshop was originally developed by
+
+* Joey Lee
+* Steph Wright
From 634950cbb442d50c2a11947603d9b9a300134f92 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 10:59:42 +0100
Subject: [PATCH 11/99] Update humans.md
---
humans.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/humans.md b/humans.md
index a5e261f..6ec877d 100644
--- a/humans.md
+++ b/humans.md
@@ -2,8 +2,10 @@
## Facilitators
-* Kirstie Whitaker
+* Kirstie Whitaker - twitter: [@kirstie_j](https://twitter.com/kirstie_j), github: [@KirstieJane](https://github.com/kirstiejane/), website: www.kirstiewhitaker.com
* Mark Dunning
+* A. Pajon
+* Gordon Brown
## Mozilla Science Lab Fellows
From 71caeaf2671d39651354a633d5850ddf1994bb98 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 11:02:59 +0100
Subject: [PATCH 12/99] sync-ed README.md
---
README.md | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index fbed601..17502ff 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,34 @@
+❤️
+
***
-We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop here - Github Workshop, July 22nd, 2016.
+We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop on July 22nd, 2016.
***
-# A Friendly Github Introduction
-This is a friendly introduction to making open, version-controlled, and collaborative projects using Github.
-
-You are invited to fork this repo and use our materials-- please let us know what you do with them and how it goes!
+# Beginners guide to version control with git
+This is a beginner friendly introduction to making open, version-controlled, and collaborative projects using git and GitHub.
## About
-This is a friendly introduction to Github – a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the Github ecosystem and help you get you comfortable navigating basic Github workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on Github (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how Github can help make your projects more readable and accessible. This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritized.
+**Description**: Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
+
+Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
+
+This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. You don't have to share your work with others or collaborate with anyone, although you'll learn how this can be achieved with ease.
+
+This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritised.
## Learning Objectives & Takeaways
At the end of the workshop, we hope you will feel acquainted and/or comfortable with:
* Github as:
- * social platform - collaboration, coordination, and contributing
+ * Social platform - collaboration, coordination, and contributing
* Time machine - track project and go back
- * documentation & sharing platform
- * project development platform
+ * Documentation & sharing platform
+ * Project development platform
* Basic Github Workflows:
- * working individually with commits, issues, branching, and merging
- * working collaboratively with issues, forking & pull requests
-
-
+ * Working individually with commits, issues, branching, and merging using git
+ * Working collaboratively with issues, forking & pull requests
## Why are we teaching GitHub?
@@ -32,10 +36,11 @@ Git/GitHub can enable projects of any size (from individuals up to organizations
At the Mozilla Science Lab, we use GitHub as a platform to share knowledge, build communities, and make science as open and accessible as possible. We hope you will use GitHub as well to make better projects.
-###What is "open" research?
-Whether you're studying the human genome, black holes, deep sea ecology, medieval music, or alternative energy sources, research is a practice and process of learning, and creating knowledge. Researchers always build on (or transform) an existing understanding of the world. **A researcher working open shares insights or discoveries freely, makes her data available on the web, or makes the details of a new experimental technique or tool public so others can use and reuse it. By working open, she empowers fellow researchers and furthers our collective knowledge... knowledge that can be used to solve problems, save lives, and inspire and amaze us all.** The more data, knowledge, methods, tools and skills made widely and openly available to all, the better.
+### What is "open" research?
+
+Whether you're studying the human genome, black holes, deep sea ecology, medieval music, or alternative energy sources, research is a practice and process of learning, and creating knowledge. Researchers always build on (or transform) an existing understanding of the world. **A researcher working open shares insights or discoveries freely, makes her data available on the web, or makes the details of a new experimental technique or tool public so others can use and reuse it. By working open, she empowers fellow researchers and furthers our collective knowledge... knowledge that can be used to solve problems, save lives, and inspire and amaze us all.** The more data, knowledge, methods, tools and skills made widely and openly available to all, the better.
-###Oh, by the way, what's Mozilla Science Lab??
+### What's Mozilla Science Lab??
At [Mozilla Science Lab](https://mozillascience.org/) we help scientists and researchers (anyone from students to established researchers to citizen scientists) to work openly and do better research, more research, and make that research more useful by sharing it widely.
We provide various types of trainings (such as this Workshop), learning materials and formats (such as [Mozilla Study Groups](http://mozillascience.github.io/studyGroupHandbook/)), platforms for sharing and showcasing open Science projects (such as [MSL Collaborate](https://mozillascience.org/collaborate)), and support for leaders in open science (through the [Mozilla Fellows for Science](https://mozillascience.org/fellows).
From a204eee555a0e03616738bb21ff5e047de701900 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 11:29:12 +0100
Subject: [PATCH 13/99] updated index and README.md
---
README.md | 11 ++++-------
index.html | 30 ++++++++++++++++++------------
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
index 17502ff..fd20699 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-❤️
-
***
We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop on July 22nd, 2016.
***
@@ -9,7 +7,7 @@ This is a beginner friendly introduction to making open, version-controlled, and
## About
-**Description**: Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
+Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
@@ -23,7 +21,7 @@ At the end of the workshop, we hope you will feel acquainted and/or comfortable
* Github as:
* Social platform - collaboration, coordination, and contributing
- * Time machine - track project and go back
+ * Time machine - track project and go back
* Documentation & sharing platform
* Project development platform
* Basic Github Workflows:
@@ -32,9 +30,9 @@ At the end of the workshop, we hope you will feel acquainted and/or comfortable
## Why are we teaching GitHub?
-Git/GitHub can enable projects of any size (from individuals up to organizations and companies) to develop in a way that is well managed, readable, and many cases, accessible and open source. GitHub is allowing professors to share their course materials online, scientists to share their analyses and data, startups to build new technologies, and governments to share data - it is enhancing our ability to do work, better.
+Git/GitHub can enable projects of any size (from individuals up to organizations and companies) to develop in a way that is well managed, readable, and many cases, accessible and open source. GitHub is allowing professors to share their course materials online, scientists to share their analyses and data, startups to build new technologies, and governments to share data - it is enhancing our ability to do work, better.
-At the Mozilla Science Lab, we use GitHub as a platform to share knowledge, build communities, and make science as open and accessible as possible. We hope you will use GitHub as well to make better projects.
+At the Mozilla Science Lab, we use GitHub as a platform to share knowledge, build communities, and make science as open and accessible as possible. We hope you will use GitHub as well to make better projects.
### What is "open" research?
@@ -44,4 +42,3 @@ Whether you're studying the human genome, black holes, deep sea ecology, medieva
At [Mozilla Science Lab](https://mozillascience.org/) we help scientists and researchers (anyone from students to established researchers to citizen scientists) to work openly and do better research, more research, and make that research more useful by sharing it widely.
We provide various types of trainings (such as this Workshop), learning materials and formats (such as [Mozilla Study Groups](http://mozillascience.github.io/studyGroupHandbook/)), platforms for sharing and showcasing open Science projects (such as [MSL Collaborate](https://mozillascience.org/collaborate)), and support for leaders in open science (through the [Mozilla Fellows for Science](https://mozillascience.org/fellows).
-
diff --git a/index.html b/index.html
index 1ca554e..46a3e9c 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
- Friendly Github Workshop
+ Beginners guide to version control with git and GitHub
@@ -32,11 +32,17 @@
-
A Friendly Github Intro Workshop
- Prepared for UBC, Vancouver, March 2016
+
Beginners guide to version control with git and GitHub
+ Forked from the Friendly Github Introduction workshop prepared by Joey Lee and Stephanie Wright in March 2016
- This is a friendly introduction to Github – a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the Github ecosystem and help you get you comfortable navigating basic Github workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on Github (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how Github can help make your projects more readable and accessible. This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritized.
+ Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
+
+ Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
+
+ This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. You don't have to share your work with others or collaborate with anyone, although you'll learn how this can be achieved with ease.
+
+ This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritised.
@@ -44,7 +50,7 @@
A Friendly Github Intro Workshop
Schedule
- The schedule can be found in the workshop repository here.
+ The schedule can be found in the workshop repository here.
Presentation
@@ -65,12 +71,12 @@
Sessions
Guides will provide participants with post-presentation exercises to complete during work sessions.
-
GitHub Essentials: Getting Started with Github - in this exercise, you will work through the basic GitHub worflow using GitHub Online and GitHub Desktop.
GitHub Essentials: Getting Started with Github - in this exercise, you will work through the basic GitHub worflow using GitHub Online and GitHub Desktop.
- We have a living etherpad where we will be collecting any questions from participants and answering either on a rolling basis or after the workshop. Hop on the pad if you've got questions, comments, or want to help answer any if the questions.
+ We have a living etherpad where we will be collecting any questions from participants and answering either on a rolling basis or after the workshop. Hop on the pad if you've got questions, comments, or want to help answer any if the questions.
Help
@@ -84,7 +90,7 @@
Getting Help
Where is it being held?
-
Irving K Barber Learning Centre, Lillooet Room 301, UBC, Vancouver
+
Bioinformatics Training Room, Craik-Marshall Building, Downing Site
@@ -107,7 +113,7 @@
What is the WIFI code?
Where can I find the Science Lab Code of Conduct?
- You can find it here. We'd love for feedback on how it could be improved. Stay tuned for the Code of Conduct session at WOW (see above).
+ You can find it here.
Beginners guide to version control with git and GitHub
- Forked from the Friendly Github Introduction workshop prepared by Joey Lee and Stephanie Wright in March 2016
-
-
- Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
- Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
+
+
Developed based on the "Friendly Github Introduction" workshop prepared by Joey Lee and Stephanie Wright in March 2016
- This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. You don't have to share your work with others or collaborate with anyone, although you'll learn how this can be achieved with ease.
+
Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
- This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritised.
-
+
Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
+
+
This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. You don't have to share your work with others or collaborate with anyone, although you'll learn how this can be achieved with ease.
+
+
This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritised.
From a20cd89b2c1088dcc120a096bcc12ba799959798 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 4 Jul 2016 13:23:31 +0100
Subject: [PATCH 15/99] kept humans.md up to date
---
humans.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/humans.md b/humans.md
index a5e261f..6ec877d 100644
--- a/humans.md
+++ b/humans.md
@@ -2,8 +2,10 @@
## Facilitators
-* Kirstie Whitaker
+* Kirstie Whitaker - twitter: [@kirstie_j](https://twitter.com/kirstie_j), github: [@KirstieJane](https://github.com/kirstiejane/), website: www.kirstiewhitaker.com
* Mark Dunning
+* A. Pajon
+* Gordon Brown
## Mozilla Science Lab Fellows
From 4acd40801cd76704593a29e150dea1a769044598 Mon Sep 17 00:00:00 2001
From: Mark Dunning
Date: Tue, 5 Jul 2016 10:51:53 +0100
Subject: [PATCH 16/99] Update humans.md
---
humans.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/humans.md b/humans.md
index 6ec877d..cd4ba04 100644
--- a/humans.md
+++ b/humans.md
@@ -3,7 +3,7 @@
## Facilitators
* Kirstie Whitaker - twitter: [@kirstie_j](https://twitter.com/kirstie_j), github: [@KirstieJane](https://github.com/kirstiejane/), website: www.kirstiewhitaker.com
-* Mark Dunning
+* Mark Dunning - twitter: [@DrMarkDunning](https://twitter.com/DrMarkDunning), github: [@markdunning](https://github.com/markdunning)
* A. Pajon
* Gordon Brown
From 519e10f0c67740b2398bf176b7c055f09c032d94 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Fri, 15 Jul 2016 10:07:48 +0100
Subject: [PATCH 17/99] Added some resources
---
index.html | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
index 52eb2c3..c86ee57 100644
--- a/index.html
+++ b/index.html
@@ -129,18 +129,25 @@
Finding Resources
Here we'll list some persistent resources that you might use throughout the workshop.
From cf6ba3be26830c370bdd1fcdfbd6941065251d66 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Fri, 15 Jul 2016 10:15:10 +0100
Subject: [PATCH 18/99] keeping gh-pages up to date with master
---
humans.md | 2 +-
index.html | 46 ++++++++++++++++++++++++----------------------
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/humans.md b/humans.md
index 6ec877d..cd4ba04 100644
--- a/humans.md
+++ b/humans.md
@@ -3,7 +3,7 @@
## Facilitators
* Kirstie Whitaker - twitter: [@kirstie_j](https://twitter.com/kirstie_j), github: [@KirstieJane](https://github.com/kirstiejane/), website: www.kirstiewhitaker.com
-* Mark Dunning
+* Mark Dunning - twitter: [@DrMarkDunning](https://twitter.com/DrMarkDunning), github: [@markdunning](https://github.com/markdunning)
* A. Pajon
* Gordon Brown
diff --git a/index.html b/index.html
index 3d501cd..c86ee57 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
- Beginners guide to version control with git and GitHub
+ Friendly Github Workshop
@@ -32,25 +32,19 @@
-
Beginners guide to version control with git and GitHub
-
-
-
Developed based on the "Friendly Github Introduction" workshop prepared by Joey Lee and Stephanie Wright in March 2016
-
-
Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
-
-
Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
-
-
This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. You don't have to share your work with others or collaborate with anyone, although you'll learn how this can be achieved with ease.
-
-
This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritised.
+
A Friendly Github Intro Workshop
+ Prepared for UBC, Vancouver, March 2016
+
+
+ This is a friendly introduction to Github – a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the Github ecosystem and help you get you comfortable navigating basic Github workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on Github (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how Github can help make your projects more readable and accessible. This workshop is developed for anyone looking for a solution to making projects – whether it be your research on arctic glaciers, the materials for an undergraduate course, your PHD thesis, or even a cookbook – more manageable. This workshop is geared towards all skill levels, but first-time and novice users are encouraged and prioritized.
+
Schedule
- The schedule can be found in the workshop repository here.
+ The schedule can be found in the workshop repository here.
Presentation
@@ -71,12 +65,12 @@
Sessions
Guides will provide participants with post-presentation exercises to complete during work sessions.
-
GitHub Essentials: Getting Started with Github - in this exercise, you will work through the basic GitHub worflow using GitHub Online and GitHub Desktop.
GitHub Essentials: Getting Started with Github - in this exercise, you will work through the basic GitHub worflow using GitHub Online and GitHub Desktop.
- We have a living etherpad where we will be collecting any questions from participants and answering either on a rolling basis or after the workshop. Hop on the pad if you've got questions, comments, or want to help answer any if the questions.
+ We have a living etherpad where we will be collecting any questions from participants and answering either on a rolling basis or after the workshop. Hop on the pad if you've got questions, comments, or want to help answer any if the questions.
Help
@@ -90,7 +84,7 @@
Getting Help
Where is it being held?
-
Bioinformatics Training Room, Craik-Marshall Building, Downing Site
+
Irving K Barber Learning Centre, Lillooet Room 301, UBC, Vancouver
@@ -113,7 +107,7 @@
What is the WIFI code?
Where can I find the Science Lab Code of Conduct?
- You can find it here.
+ You can find it here. We'd love for feedback on how it could be improved. Stay tuned for the Code of Conduct session at WOW (see above).
@@ -135,18 +129,25 @@
Finding Resources
Here we'll list some persistent resources that you might use throughout the workshop.
From 221bbb88cb1adc4036073cfae2cf52c98f823c64 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Fri, 15 Jul 2016 10:20:35 +0100
Subject: [PATCH 19/99] add changes to readme file
---
README.md | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index fd20699..17502ff 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+❤️
+
***
We have a living [Etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro) for the workshop on July 22nd, 2016.
***
@@ -7,7 +9,7 @@ This is a beginner friendly introduction to making open, version-controlled, and
## About
-Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
+**Description**: Version control is the management of changes to documents, computer programs, and other collections of information. Changes are usually identified by a number named the "revision number". Each revision is associated with a timestamp and the person making the change. Revisions can be compared, restored, and with some types of files, merged.
Github is a free and open source platform that can help you build projects that are collaborative, well documented, and version-controlled. In this workshop we will introduce you to the GitHub ecosystem and help you get you comfortable navigating basic GitHub workflows. We will make sure that you leave the workshop aware of the best practices for developing projects on GitHub (e.g. writing a good “readme” or posting and labeling issues) and an understanding of how GitHub can help make your projects more readable and accessible.
@@ -21,7 +23,7 @@ At the end of the workshop, we hope you will feel acquainted and/or comfortable
* Github as:
* Social platform - collaboration, coordination, and contributing
- * Time machine - track project and go back
+ * Time machine - track project and go back
* Documentation & sharing platform
* Project development platform
* Basic Github Workflows:
@@ -30,9 +32,9 @@ At the end of the workshop, we hope you will feel acquainted and/or comfortable
## Why are we teaching GitHub?
-Git/GitHub can enable projects of any size (from individuals up to organizations and companies) to develop in a way that is well managed, readable, and many cases, accessible and open source. GitHub is allowing professors to share their course materials online, scientists to share their analyses and data, startups to build new technologies, and governments to share data - it is enhancing our ability to do work, better.
+Git/GitHub can enable projects of any size (from individuals up to organizations and companies) to develop in a way that is well managed, readable, and many cases, accessible and open source. GitHub is allowing professors to share their course materials online, scientists to share their analyses and data, startups to build new technologies, and governments to share data - it is enhancing our ability to do work, better.
-At the Mozilla Science Lab, we use GitHub as a platform to share knowledge, build communities, and make science as open and accessible as possible. We hope you will use GitHub as well to make better projects.
+At the Mozilla Science Lab, we use GitHub as a platform to share knowledge, build communities, and make science as open and accessible as possible. We hope you will use GitHub as well to make better projects.
### What is "open" research?
@@ -42,3 +44,4 @@ Whether you're studying the human genome, black holes, deep sea ecology, medieva
At [Mozilla Science Lab](https://mozillascience.org/) we help scientists and researchers (anyone from students to established researchers to citizen scientists) to work openly and do better research, more research, and make that research more useful by sharing it widely.
We provide various types of trainings (such as this Workshop), learning materials and formats (such as [Mozilla Study Groups](http://mozillascience.github.io/studyGroupHandbook/)), platforms for sharing and showcasing open Science projects (such as [MSL Collaborate](https://mozillascience.org/collaborate)), and support for leaders in open science (through the [Mozilla Fellows for Science](https://mozillascience.org/fellows).
+
From 6f9fd51364c6cf23a5cff2d9e0d857f25f87ecd1 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Fri, 15 Jul 2016 10:26:17 +0100
Subject: [PATCH 20/99] Added in link to resources in nav bar
---
index.html | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/index.html b/index.html
index c86ee57..68a72f6 100644
--- a/index.html
+++ b/index.html
@@ -23,6 +23,7 @@
GuidesNotesHelp
+ ResourcesSurvey
@@ -129,7 +130,7 @@
Finding Resources
Here we'll list some persistent resources that you might use throughout the workshop.
-
-
-* TBD
-
-**3:15 - 3:30: Close**
-
-* Wrapping up last questions, feedback, etc.
+**16:15 - 16:30: More things you can do with GitHub**
+* Presentation: [The Github desktop application](https://docs.google.com/presentation/d/1Tfa3zSGAxDPBkLwC5DByGIsyJJIIvTi-vaxuY6oQtFY/edit?usp=sharing)
+ * Host a project website
+ * Collaborating with open source projects
+ * Lead your own open source project
+
+**16:30 - 17:30: Freetime to play & ask questions**
+* Ask us questions, add more commits, set up a website. Whatever works for you.
From 1e0d702763b0be02d95801b725e7c0bd77d383b9 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 07:43:56 +0100
Subject: [PATCH 29/99] Update schedule.md
---
schedule.md | 50 +++++++++++++++++++++++++++-----------------------
1 file changed, 27 insertions(+), 23 deletions(-)
diff --git a/schedule.md b/schedule.md
index ce1a02b..2f66fb3 100644
--- a/schedule.md
+++ b/schedule.md
@@ -1,49 +1,53 @@
# Schedule
-Here's the roadmap for the workshop:
+Here's the roadmap for the workshop on 22nd July 2016
-**13:30 - 14:00 Postit session**
+**13:30 - 13:50 Postit session**
* An interactive discussion on:
* Why is version control useful?
* What do you do for version control at the moment?
* Why do you want to learn about git and GitHub?
+**13:50 - 14:00 Welcome, code of conduct and learning objectives**
+
+* Code of conduct
+* Resources
+ * README
+ * webpage
+ * etherpad
+ * learning objectives
+
**14:00 - 14:15: Introduction to version control with git and github**
* Presentation: [Github - What, Why, & Welcome](https://docs.google.com/presentation/d/1Tfa3zSGAxDPBkLwC5DByGIsyJJIIvTi-vaxuY6oQtFY/edit?usp=sharing)
- * What is version control?
- * Why should you care?
- * Using git and GitHub
- * Glossary
+ * What is version control?
+ * Why should you care?
+ * Using git and GitHub
+ * Glossary
**14:15 - 14:40: Exercise 1: Your first pull request**
* Add your github username to the [workshop repository](https://github.com/KirstieJane/friendly-github-intro)
- * Instructions: [Your first pull request](LINK)
+ * Instructions at [Exercise 1](LINK)
**14:40 - 14:55: Setting up your first repository on GitHub**
-* Demo: [GitHub - Our First GitHub Project: Let’s get set up!](https://docs.google.com/presentation/d/1TkOLnznhfo_2sB4YnStyK8_Lo9WTgDt6xoRcMkyuJdY/edit?usp=sharing)
+* Presentation: [GitHub - Our First GitHub Project: Let’s get set up!](https://docs.google.com/presentation/d/1TkOLnznhfo_2sB4YnStyK8_Lo9WTgDt6xoRcMkyuJdY/edit?usp=sharing)
**14:55 - 15:30: Exercise 2: Set up your project**
-[Github Essentials Guide](http://joeyklee.github.io/friendly-github-intro/guides/github-essentials/)
-
* Add your github username to the [workshop repository](https://github.com/KirstieJane/friendly-github-intro)
- * Instructions: [Your first pull request](LINK)
-
-* You will have an hour to play around in the GitHubverse - we will be around to help clarify and guide you through any questions you might have.
-* To get a feeling for the workflow shown in the prior presentations, try to:
- * Create a repo from scratch
- * Make a README using markdown documenting what your project is about, who is involved, why it is interesting, how to get the project setup (e.g. what version of R, what packages are you using, links to references, and add a friendly gif, etc.)
- * Create some issues that need to be completed - add labels to them.
- * Create a few commits
- * Create a branch to experiment new features on:
- * make a pull request to merge those changes into your "master" branch
- * Revert a commit
- * Celebrate!
-
+ * Instructions: [Exercise 2](http://kirstiejane.github.io/friendly-github-intro/guides/github-essentials/)
+ * Create a repo from scratch
+ * Make a README using markdown
+ * Create some issues that need to be completed - add labels to them.
+ * Create a few commits
+ * Create a branch to experiment new features on:
+ * make a pull request to merge those changes into your "master" branch
+ * Revert a commit
+ * Ask as many questions as you need! Either in person or on the [etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro)
+
**15:30 - 15:45: Working locally using git**
* Presentation: [The Github desktop application](https://docs.google.com/presentation/d/1Tfa3zSGAxDPBkLwC5DByGIsyJJIIvTi-vaxuY6oQtFY/edit?usp=sharing)
From b41e3f811097bc5e13407859d28e565c4fe3c41a Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 07:55:30 +0100
Subject: [PATCH 30/99] Update schedule.md
---
schedule.md | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/schedule.md b/schedule.md
index 2f66fb3..11abcfe 100644
--- a/schedule.md
+++ b/schedule.md
@@ -11,12 +11,20 @@ Here's the roadmap for the workshop on 22nd July 2016
**13:50 - 14:00 Welcome, code of conduct and learning objectives**
-* Code of conduct
+* Take a moment to read through the Mozilla Science Lab's [code of conduct](https://science.mozilla.org/code-of-conduct)
* Resources
- * README
- * webpage
- * etherpad
- * learning objectives
+ * [README](https://github.com/KirstieJane/friendly-github-intro/blob/master/README.md)
+ * [webpage](https://kirstiejane.github.io/friendly-github-intro)
+ * [etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro)
+* Learning objectives
+ * By the end of the course you should know:
+ * What is version control, and why is it crucial for research?
+ * Git and github; what is the difference?
+ * Why git is not just for programmers.
+ * And you should be able to:
+ * Create a git repository for your project.
+ * Collaborate and share your projects with others using GitHub.
+ * Work on your project locally and push changes to GitHub.
**14:00 - 14:15: Introduction to version control with git and github**
@@ -30,22 +38,16 @@ Here's the roadmap for the workshop on 22nd July 2016
* Add your github username to the [workshop repository](https://github.com/KirstieJane/friendly-github-intro)
* Instructions at [Exercise 1](LINK)
+ * Ask as many questions as you need! Either in person or on the [etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro)
**14:40 - 14:55: Setting up your first repository on GitHub**
-* Presentation: [GitHub - Our First GitHub Project: Let’s get set up!](https://docs.google.com/presentation/d/1TkOLnznhfo_2sB4YnStyK8_Lo9WTgDt6xoRcMkyuJdY/edit?usp=sharing)
+* Presentation: [Our First GitHub Project: Let’s get set up!](https://docs.google.com/presentation/d/1TkOLnznhfo_2sB4YnStyK8_Lo9WTgDt6xoRcMkyuJdY/edit?usp=sharing)
**14:55 - 15:30: Exercise 2: Set up your project**
* Add your github username to the [workshop repository](https://github.com/KirstieJane/friendly-github-intro)
* Instructions: [Exercise 2](http://kirstiejane.github.io/friendly-github-intro/guides/github-essentials/)
- * Create a repo from scratch
- * Make a README using markdown
- * Create some issues that need to be completed - add labels to them.
- * Create a few commits
- * Create a branch to experiment new features on:
- * make a pull request to merge those changes into your "master" branch
- * Revert a commit
* Ask as many questions as you need! Either in person or on the [etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro)
**15:30 - 15:45: Working locally using git**
@@ -57,15 +59,13 @@ Here's the roadmap for the workshop on 22nd July 2016
**15:45 - 16:15: Exercise 3: Sync your GitHub repository to your laptop**
-* Presentation + Demo: [Collaborating with GitHub](https://docs.google.com/presentation/d/1v-gIFtZhyXEIfsUbizvGc_X8UqeQJ8IlBtdRYeDnkbA/edit?usp=sharing)
-
-[GitHub Collaboration Workflow](http://joeyklee.github.io/friendly-github-intro/guides/github-collaboration-party/)
-* Group Exercise: Let's Plan a Party
- * As a group we will work to plan a party - each table will be tasked with developing one of the details of the party (e.g. food, invitations, venue, etc)
+* Sync your repo to your laptop then push a commit
+ * Instructions at [Exercise 3](LINK)
+ * Ask as many questions as you need! Either in person or on the [etherpad](https://public.etherpad-mozilla.org/p/2016-07-22-friendly-github-intro)
**16:15 - 16:30: More things you can do with GitHub**
-* Presentation: [The Github desktop application](https://docs.google.com/presentation/d/1Tfa3zSGAxDPBkLwC5DByGIsyJJIIvTi-vaxuY6oQtFY/edit?usp=sharing)
+* Presentation: [More things you can do with GitHub](https://docs.google.com/presentation/d/1Tfa3zSGAxDPBkLwC5DByGIsyJJIIvTi-vaxuY6oQtFY/edit?usp=sharing)
* Host a project website
* Collaborating with open source projects
* Lead your own open source project
@@ -73,3 +73,4 @@ Here's the roadmap for the workshop on 22nd July 2016
**16:30 - 17:30: Freetime to play & ask questions**
* Ask us questions, add more commits, set up a website. Whatever works for you.
+* Complete the post workshop survey.
From 85cc7f5da54d36a5043a11200204e9b639fa913e Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 09:16:01 +0100
Subject: [PATCH 31/99] Added in lines for participants
---
humans.md | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/humans.md b/humans.md
index cd4ba04..45ddb36 100644
--- a/humans.md
+++ b/humans.md
@@ -7,9 +7,14 @@
* A. Pajon
* Gordon Brown
+## Participants on July 22nd 2016
+
+*
+*
+
## Mozilla Science Lab Fellows
-The workshop was originally developed by
+The workshop was originally developed by
* Joey Lee
* Steph Wright
From cd957f4591c06fdd29c5b68d62bca595d37ae0ae Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 09:17:51 +0100
Subject: [PATCH 32/99] added bullet points
---
humans.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/humans.md b/humans.md
index 45ddb36..8f43147 100644
--- a/humans.md
+++ b/humans.md
@@ -10,7 +10,7 @@
## Participants on July 22nd 2016
*
-*
+*
## Mozilla Science Lab Fellows
From 79697fb3843b1781a8e69e2ad5b5e4c3c8001d51 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 09:18:30 +0100
Subject: [PATCH 33/99] added bullet points
---
humans.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/humans.md b/humans.md
index 8f43147..45ddb36 100644
--- a/humans.md
+++ b/humans.md
@@ -10,7 +10,7 @@
## Participants on July 22nd 2016
*
-*
+*
## Mozilla Science Lab Fellows
From 6415a0970a2b83abba450560f41fff4c64c8ee3e Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 09:22:58 +0100
Subject: [PATCH 34/99] added sample participants
---
humans.md | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/humans.md b/humans.md
index 45ddb36..da5bdb6 100644
--- a/humans.md
+++ b/humans.md
@@ -2,19 +2,19 @@
## Facilitators
-* Kirstie Whitaker - twitter: [@kirstie_j](https://twitter.com/kirstie_j), github: [@KirstieJane](https://github.com/kirstiejane/), website: www.kirstiewhitaker.com
-* Mark Dunning - twitter: [@DrMarkDunning](https://twitter.com/DrMarkDunning), github: [@markdunning](https://github.com/markdunning)
-* A. Pajon
+* Kirstie Whitaker - github: [@KirstieJane](https://github.com/kirstiejane/), twitter: [@kirstie_j](https://twitter.com/kirstie_j), website: www.kirstiewhitaker.com
+* Mark Dunning - github: [@markdunning](https://github.com/markdunning), twitter: [@DrMarkDunning](https://twitter.com/DrMarkDunning)
+* Anne Pajon
* Gordon Brown
## Participants on July 22nd 2016
-*
-*
+* Test name 1 - github: [github username](link-to-github-homepage)
+* Test name 2 - github: [github username](link-to-github-homepage)
## Mozilla Science Lab Fellows
-The workshop was originally developed by
+The workshop was originally developed by:
-* Joey Lee
-* Steph Wright
+* Joey Lee - github: [@joeyklee](https://github.com/joeyklee)
+* Steph Wright - github: [@stephwright](https://github.com/stephwright)
From 23f1a59be35eb7362f94ac75f810e46d08a4f696 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 09:25:36 +0100
Subject: [PATCH 35/99] keeping master in sync with gh-pages
---
humans.md | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/humans.md b/humans.md
index cd4ba04..da5bdb6 100644
--- a/humans.md
+++ b/humans.md
@@ -2,14 +2,19 @@
## Facilitators
-* Kirstie Whitaker - twitter: [@kirstie_j](https://twitter.com/kirstie_j), github: [@KirstieJane](https://github.com/kirstiejane/), website: www.kirstiewhitaker.com
-* Mark Dunning - twitter: [@DrMarkDunning](https://twitter.com/DrMarkDunning), github: [@markdunning](https://github.com/markdunning)
-* A. Pajon
+* Kirstie Whitaker - github: [@KirstieJane](https://github.com/kirstiejane/), twitter: [@kirstie_j](https://twitter.com/kirstie_j), website: www.kirstiewhitaker.com
+* Mark Dunning - github: [@markdunning](https://github.com/markdunning), twitter: [@DrMarkDunning](https://twitter.com/DrMarkDunning)
+* Anne Pajon
* Gordon Brown
+## Participants on July 22nd 2016
+
+* Test name 1 - github: [github username](link-to-github-homepage)
+* Test name 2 - github: [github username](link-to-github-homepage)
+
## Mozilla Science Lab Fellows
-The workshop was originally developed by
+The workshop was originally developed by:
-* Joey Lee
-* Steph Wright
+* Joey Lee - github: [@joeyklee](https://github.com/joeyklee)
+* Steph Wright - github: [@stephwright](https://github.com/stephwright)
From eb2f581a8757d5f9db5f42d460a62949e8d5b5f6 Mon Sep 17 00:00:00 2001
From: Kirstie Whitaker
Date: Mon, 18 Jul 2016 10:15:48 +0100
Subject: [PATCH 36/99] updated first exercise
---
.../images-slides/my-first-pr-find-repo.PNG | Bin 0 -> 110998 bytes
assets/images-slides/my-first-pr-fork.PNG | Bin 0 -> 403872 bytes
assets/images-slides/my-first-pr-fork2.PNG | Bin 0 -> 426819 bytes
.../images-slides/my-first-pr-humans-edit.gif | Bin 0 -> 1647060 bytes
assets/images-slides/my-first-pr-humans1.PNG | Bin 0 -> 410295 bytes
assets/images-slides/my-first-pr-humans2.PNG | Bin 0 -> 369411 bytes
assets/images-slides/my-first-pr-login1.PNG | Bin 0 -> 399755 bytes
assets/images-slides/my-first-pr-login2.PNG | Bin 0 -> 175315 bytes
assets/images-slides/my-first-pr-new-pr1.PNG | Bin 0 -> 296359 bytes
assets/images-slides/my-first-pr-new-pr2.PNG | Bin 0 -> 401178 bytes
.../images-slides/my-first-pr-wrong-repo.PNG | Bin 0 -> 422367 bytes
exercises/my-first-pullrequest/index.html | 230 ++++++++++++++++++
12 files changed, 230 insertions(+)
create mode 100644 assets/images-slides/my-first-pr-find-repo.PNG
create mode 100644 assets/images-slides/my-first-pr-fork.PNG
create mode 100644 assets/images-slides/my-first-pr-fork2.PNG
create mode 100644 assets/images-slides/my-first-pr-humans-edit.gif
create mode 100644 assets/images-slides/my-first-pr-humans1.PNG
create mode 100644 assets/images-slides/my-first-pr-humans2.PNG
create mode 100644 assets/images-slides/my-first-pr-login1.PNG
create mode 100644 assets/images-slides/my-first-pr-login2.PNG
create mode 100644 assets/images-slides/my-first-pr-new-pr1.PNG
create mode 100644 assets/images-slides/my-first-pr-new-pr2.PNG
create mode 100644 assets/images-slides/my-first-pr-wrong-repo.PNG
create mode 100644 exercises/my-first-pullrequest/index.html
diff --git a/assets/images-slides/my-first-pr-find-repo.PNG b/assets/images-slides/my-first-pr-find-repo.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..224f4caa9ca9060059931755e47d59170a51fdd8
GIT binary patch
literal 110998
zcmcG#cT^Ky+czp8A|is)rGwIofPl1wrYOCGgeFB=0@6DOC?JAJm)<*s9y$T(U25pP
zx6pf%llytU`?;TU-tSxQKj&L(vdDy)Ju`c*eeLU4_BVA^1>y%!AKbZfhxpxFdCfa_
z?oQpggC}_Z9`+abkPjvH500~@g6tjW5ZyL*=dP8Eip-rm6_G@@AMmmJgrDBNcfNDy
ziOXLfoQ02!9(V3wa^K0zXnPp%p@@8RCsO(D2&IaRo!q1%eXOnr6G!S(Dx|E2PF;p<
zB%}t$1@q}aplXV4%F@>m4FX;+SNYdbS)re)?f!&jsDDwc=VoHza3ZXwmVLss{DkS5
z^b;oLFVE&=>k2RqQoEH7NWYVodYLC_RvX(hcBPo>vKovxoO5^E!0y89pnmhqvv<+|
zY`riIBJf=q(!VzsND~HqGoN&KL`xKJe8@kwg@e7Z*qQ;{aY&M%C_rJZrpQJ;^-uuFZ1qDAV%)9$q1Mn<&Crc~+F@Bz>BMO#_
zExwg*`v$zfI&0kJK{@#N_<|mXrk+>p3G06{9Q~fL$1;BEg4b@TQ$KHQkMG5NzFvK21iRw@;aR4PJ=ZD3JPtE>
z-dD<(iPH*w3{Sh2)9xQ0PVhY0*oLIV#l<7Ew)gy(!ejR=c7vey+^Cv!Y00FI=&3FJD-AQ@>G(m>qNZI!D61rIm+n(qwBL>
z_T1cDubNpBzeBwGec0@&t#EDNz5?(%%D5Efys6q;KfxlF?#v!`LgVD8QbFe(!tjr4v>e6T{qQwoVZrvKA*
zl3#oXG}Z~8upyn^7)s@ilsf+f;2tCdGXXq4b|VMN&%pwARE?z3E$upNPH;I7xJ3Ya`+hvk7g(q`*
z3R+QHhNn9d#X5UKt(UdnX*1_uoMa`(vi~;59y}=?Vaoe}Pb<$~BH1o75*&PwHx#na
z^xl8%&Tm?56x+6o*-r6=kn^JeLf++!wYl=-Y5LIFNREd`P6L^8EfLJl9_
zjg_nZPOJ4(elts0R@0qoD&^B;bWi*b6@`HR_S!U7%<(SE+lcs^GVn#gBwzoW_pnA<
z|DY4oB>KqFy(3JzS-sqTZ|dNx6^~@AYBGajDO{w)$@yG=`knx>NO|+sMsj^%Dbcdx
zlc~?~cdL~+p*Zv`|YsY%h1pUmzI=0$H>-^*gB?l<4dR-5Ec8(
zn}@UR??f~*fgQQ7>`zj^b8DF51qRNnlOjIr5`i6m1zJk*qKJ{_(^XdMw^t|R(|;$)f{4XF$0GHA~7=e6)gM;E~QUA;dTYYt-cVY2gs+D;E
zI#ovb(@GMk8HP=()6L$sHB6ytL?xpgTrjPCRnOw7l%9J}{+S8%e#bp4&t=UpQjFp)
zY~7H*%U-_x$GyZDgv~@L0N)vdn((I>Dzp`i22ybw-%CtxJKwfcGpyips?V@q{YRkNcFbgN|)!iLz^+jLNQ0xfp^xa
z?hG?+K?F4gd%6|NwVxO7>L$tD=PoPR{&Y}Q6crR=m-|F^Hp-Uw;O}vO&8{P^kDpA<
zE$=%PBd|I1EE8D>us>W{YBPA%SZ@Mseu$j5N{=h^-M2d~b@0{FSh37Gh3UNTNS8w*j1hlr$qo*!G!yP*u}NVn%M7cM?J+h&Dd
zFMZ~1*9*e4S+@|IRjt2&;^Ppy6M1bHKYY|7Rv!Pl#h`6S^&Z8kNcA63HY
zvGhlyDyy_e5yL?EPp@w!y(OIrTrv1`HnY&|eHMV^&CJMX1ttD#9uZ7I1fM_Z$!5GG
zGQK~f*
z3aSb@UPC1&9{(od??EmY^Gf_ks}cqb(J%7r5a->RoqUTe=EAveb1~-}*@Vs0F!@vA
zzLhVvOi!Oawb&lb)dYcdOU>FH@Mh&n=nEq#y2Qiune}q7TOWx3^D>zl*rFeRr|uCv
zULHskGI*Qdi=IEfzmU3oWv
z>?{3EUVX1FvXc;O%R?qosG+}?#^c*^
zRBbUEn6%d!y??;YCbE1f+(!Vvj-C_tO+G_#Ob=f~6{in9BJzC<6lPS8ub%~nL`)x_
zibCV_tBi