Skip to content

Commit a36bf79

Browse files
feiphoonfeiphoon
committed
Finish up the slides content
1 parent 943e64b commit a36bf79

1 file changed

Lines changed: 37 additions & 32 deletions

File tree

‎slides/slides.md‎

Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@ page_number: true
1313
###### *26/02/2019*
1414

1515
---
16-
For Alessia, if you need a slide or two?
16+
##### For Alessia, if you need a slide or two?
1717
---
1818

1919
*Actually, you're here to learn:*
20+
2021
#### ~~Git/Hub for Collaborative DataSci & DataEng~~
22+
2123
# Good Collaboration in Nearly Anything File-Based, using GitHub
2224

2325
---
24-
# Good collaboration...
26+
## Good collaboration...
2527

2628
- makes a safe space for constructive and honest discussion.
2729
- makes room and time for teaching and learning.
@@ -31,14 +33,15 @@ For Alessia, if you need a slide or two?
3133
- is first and foremost about working with and respecting other people.
3234

3335
---
34-
# Good collaboration...
36+
## Good collaboration...
37+
38+
- is NOT an optional "soft" skill for engineers - it's essential!
3539

36-
- is NOT a "soft", optional skill for engineers - it's essential!
3740

38-
**Git & GitHub are only tools to help us focus on contribution and discussion.**
41+
### **Git & GitHub are only tools to help us focus on tracking contribution and discussion.**
3942

4043
---
41-
# Git vs GitHub
44+
## Git vs GitHub
4245

4346
- **Git != GitHub**
4447

@@ -47,7 +50,7 @@ For Alessia, if you need a slide or two?
4750
- **Git:** a version control system; the underlying magic/the engine under the hood, that manages contribution history and order.
4851

4952
---
50-
# Basic Git Concepts
53+
## Key Git Concepts
5154

5255
1. **Repository:** a project.
5356
2. **Branch:** a collection of changes.
@@ -57,30 +60,28 @@ For Alessia, if you need a slide or two?
5760
6. **Merge**: the action that accepts your branch into the master branch.
5861

5962
---
60-
# Today's learning objectives +++++
63+
## Today's learning objectives
6164

6265
- Learn a universally-accepted collaboration workflow
63-
- Use basic Git concepts on a project, using the GitHub web UI.
66+
- Use key Git concepts on a project, using the GitHub web UI.
6467

6568
---
66-
# Workshop Time
69+
## Workshop Time
6770

6871
See: https://github.com/feiphoon/github-workshop/
6972

7073
Reminders for collaboration:
7174

72-
- Be kind (you can still be firm and opinionated!)
75+
- Be kind (you can still be firm & opinionated!)
7376
- Leave constructive comments
74-
- If you feel an online conversation is getting out of control, retry the discussion in person.
75-
- If you're lost, ask for help! There are no stupid questions, only lost people feeling sad that they didn't ask for help sooner.
77+
- If you feel an online conversation isn't working out, retry the discussion in person.
78+
- If you're lost, ask for help! There are no silly questions, only lost people feeling sad that they didn't ask for help sooner.
7679

7780
---
78-
# A Recap
79-
80-
Today, you:
81+
## Workshop Recap
8182

8283
- created a repository
83-
- learned to make commits (to master, the NAUGHTY way!)
84+
- learned to make commits
8485
- logged an issue
8586
- responded to an issue
8687
- asked for a review
@@ -90,16 +91,16 @@ Today, you:
9091
- tidied up!
9192

9293
---
93-
# Git in the Wild
94+
## Git in the Wild
9495

95-
- Today's process - a pared-down version of what many people use, from individuals and small teams, to developers & engineers at companies
96+
- Today's exercise: a pared-down version of what many code contributors use, from individuals & small teams on hobby projects, to developers & engineers on large repositories at work.
9697

97-
- Other patterns for collaboration with Git:
98-
- git-flow - fancier version of what we did today, designed especially to manage releases e.g. `your-repo v1.7`
99-
- forking - especially for open source or community-supported projects
98+
- Other variations for Git collaboration:
99+
- **git-flow** - fancier version of what we did today, designed especially to manage releases e.g. `release v1.7`
100+
- **forking** - especially for open source or community-supported projects
100101

101102
---
102-
# Git & GitHub
103+
## Git the Party Started
103104

104105
- Examples of non-code projects on GitHub:
105106
- A crowdsourced travel itinerary: https://github.com/dylanegan/travel
@@ -108,24 +109,28 @@ Today, you:
108109
- Open source libraries with collaborators all over the world, e.g. https://python-sprints.github.io/
109110

110111

111-
- Other interfaces for Git - workflow preferences: Bitbucket, Gitlab, GitHub Desktop, Git command line, code editors (Atom/Sublime/PyCharm)
112+
---
113+
## Other Interfaces for Git
112114

115+
This is down to your workflow preferences:
116+
- Bitbucket
117+
- Gitlab
118+
- GitHub Desktop
119+
- Git command line
120+
- Git integration in code editors & IDEs (Atom/Sublime/PyCharm)
113121

114-
- GitHub web UI renders Markdown and CSV files very nicely
115-
- Notebooks & file diffs: Jupyter notebooks vs R Markdown
116122
---
123+
## Your Future Lies In:
117124

118-
# Your future lies in:
119-
120-
- finishing these exercises with your teammates (if you haven't already!)
121-
- starring this repository (https://github.com/feiphoon/github-workshop) for reference - we've added some light recap reading
125+
- finishing these exercises with your teammates
126+
- starring the workshop repo for reference - check back for some light recap reading
122127
- looking at the history of the workshop repository - we collaborated remotely to create it!
123-
- exploring GitHub further & using it for a real project
128+
- exploring GitHub further by using it for a project
124129
- coming to our next session to learn to use GitHub Desktop and Git from command line
125130
- eventually learning to contribute to open source e.g. Pandas
126131
---
127132

128133
# Question Time
129134
---
130135

131-
# Thank you! +++++
136+
# Thank you!

0 commit comments

Comments
 (0)