Module 3: Group work

You’ve mastered all the elements of individual work, where students are working solo on their own repositories. Now we’re going to go over how students can collaborate on technical projects and we’ll start with the GitHub flow.

3.1

• Watch 3.1: The GitHub flow
• Exercise: Pull requests

1. On the command line, create repository for Module 3 and a readme file.
2. On github.com, create a module 3 repo and add it as a remote.
3. In your terminal, create a new branch with a questions.md document, and write down any remaining questions you have about pull requests.
4. Add a remote tracking branch and push to it.
5. On github.com, open a pull request with the branch that has your questions--you should add Eric Rosado (@ericdrosado) as a collaborator on your repository, and then request his review for these pull requests.
6. Post a screenshot of your pull request to the forums.

3.2

• Watch 3.2: Merge conflicts

Here are some resources for your students to explore merge conflicts in class:

• Polygons
• GitHub Training: Merge Conflicts

3.3

• Watch 3.3 Assigning group work
• Exercise: Pull requests and merge conflicts

1. Accept the group assignment, join a team, and gain access to a shared repository.
2. From the shared repository on github.com, clone the repository down to your local machine.
3. Edit the “Group Assignment” markdown file in your text editor.
4. Save it out, stage the changes and push to the Module 3 repository.
5. Resolve any merge conflicts that arise.

3.4

• Watch: Assessing collaboration
• Exercise: Assess a live project

1. Find an active open source project.
2. Point to 2 pieces of evidence that the project is active. These pieces of evidence can be:

• How quickly pull requests are reviewed
• Data in Insights
• Number of forks or stars
• Some other metric :)

3. Reflect on how you might use these insights to assess collaboration in group work.