Software Engineering

Demo: Homework 3 Team Collaboration

Video: https://youtu.be/yVTNEGnp6Lo

In this demonstration, I’ll illustrate how you will collaborate with your teammates to complete Homework 3.

This demo will feature two collaborating teammates, Alice and Bob. Each of them has access to a shared GitHub repo. They will use this shared repository to complete Homework 3.

Alice and Bob Get Set (1:06)

1. (1:16) Alice clones the repo.
2. (3:25) Bob clones the repo.

Alice Goes First (4:56)

1. (5:21) Alice edits her working copy.
2. (11:06) Alice commits her changes to her local repo.
3. (12:24) Alice pushes her changes to the GitHub repo.

Bob Goes Second (13:33)

1. (13:53) Bob edits his working copy.
2. (17:31) Bob commits his changes to his local repo.
3. (18:29) Bob tries unsuccessfully to push his changes to the GitHub repo.

Bob Merges His Code with the GitHub Repo (19:30)

1. (20:07) Bob pulls the latest commits from the GitHub repo.
2. (22:33) Bob edits the code to resolve the merge conflicts.
3. (25:55) Bob commits the merged code to his local repo.
4. (27:12) Bob pushes the merged code to the GitHub repo.

Alice Syncs Up with Bob (29:50)

1. (29:54) Alice pulls the latest commits from the GitHub Repo

Alice Tags the Team’s Submission (30:38)

1. (30:52) Alice tags the latest version of the code.
2. (32:17) Alice pushes the tag to the GitHub repo.
3. (33:50) Bob pulls the tag from the GitHub repo.

© Scott D. Fleming 2018 • Made with GitHub Pages and Markdown