Skip to content

Commit b74f8c7

Browse files
authored
Merge pull request #543 from python-discord/bootcamp-update
Updating bootcamp information
2 parents 6497f4b + 0284db7 commit b74f8c7

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

pydis_site/templates/events/pages/code-jams/8/_index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h3 id="important-dates"><a href="#important-dates">Important Dates</a></h3>
2525
<li>Tuesday, June 15 - Form to submit theme suggestions opens</li>
2626
<li>Monday, June 21 - <a href="https://github.com/python-discord/cj8-qualifier">The Qualifier</a> is released</li>
2727
<li>Friday, June 25 - Voting for the theme opens</li>
28-
<li>Saturday, June 26 - <a class="has-text-link" href="{% url "events:page" path="code-jams/8/github-bootcamp" %}">GitHub Bootcamp</a></li>
28+
<li>Saturday, June 26 @ 4PM UTC- <a class="has-text-link" href="{% url "events:page" path="code-jams/8/github-bootcamp" %}">GitHub Bootcamp</a></li>
2929
<li>Wednesday, June 30 - The Qualifier closes</li>
3030
<li>Friday, July 9 - Code Jam begins</li>
3131
<li>Friday, July 16 - Coding portion of the jam ends</li>

pydis_site/templates/events/pages/code-jams/8/github-bootcamp.html

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,29 @@
1313

1414
{% block event_content %}
1515
<p>
16-
This year we'll be running a GitHub Bootcamp on Saturday, June 26th.
16+
<strong>This year we'll be running a GitHub Bootcamp on Saturday, June 26th at 4PM UTC.</strong>
1717
This bootcamp is intended to be an interactive workshop session where we help participants
18-
get setup with git and using it in a team environment.
18+
get setup with git and using it in a team environment. If you are new to git or would like to brush up on it,
19+
then this is the perfect event for you.
20+
</p>
21+
<p>
22+
The instructional parts of this bootcamp will be recorded. We'll also be providing a cheatsheet / reference guide to all attendees that will
23+
be made available here for download.
1924
</p>
2025
<h3>Session 1: Setting up Git</h3>
2126
<p>
22-
This session will run for an hour and be focused on installing and setting up git for the first time.
23-
We'll have helpers available to help you set up git and get it integreated with your editor of choice.
27+
This first session will run for an hour starting at 4PM UTC. It will be focused on installing and setting up git for the first time.
28+
We'll have helpers available to help you set up git and integrated with your editor of choice.
2429
Whether it's PyCharm, VSCode, or vim, we can help you get rolling with version control.
2530
</p>
2631
<h3>Session 2: Using git and github in a team environment</h3>
2732
<p>
28-
This session will run for an hour. It will be focused on using git and GitHub in a team environment.
29-
You'll be put in a group of people with a repo to work on.
33+
This session will run for an hour starting at 5PM UTC. It will be focused on using git and GitHub in a team environment.
34+
You'll be put in a group with other attendees and use the common git commands for working in a repo.
35+
You'll learn how to set-up a GitHub repository with other contributors, how to make branches, make commits, pull down changes, and then make pull requests.
36+
We'll also be going over different strategies for creating branches and best practices for commits and pull requests.
3037
</p>
3138

32-
33-
3439
{% endblock %}
3540

3641
{% block sidebar %}

0 commit comments

Comments
 (0)