Version 2019-Spring-1.0, Revised 3 March 2019
Activity for practicing with Git branching, GitHub issues and merge requests, and Kanban flow.
For this activity, the students will practice making changes to a GitHub repository. The repository has a text file that has been "scrambled" - meaning that random words have had their characters randomly rearranged, and considered to be issues to be fixed.
The misspellings were generated by the twiddle.py program and then entered as issues by the report.py program (from this git-twiddler fork.
- Git installed and configured on your computer.
- GitHub account created and username emailed to professor.
- Invitation to class organization on GitHub accepted.
- SSH key added to GitHub account.
If you have not completed these setup steps, see the instructions at the bottom of this document.
- Fork the repository
- Clone the repository
- Add the original repository as an upstream remote:
git remote add upstream git@github.com:cs-worcester-cs-348-sp-2019/git-issue-activity.git
- Go to the project board: https://github.com/cs-worcester-cs-348-sp-2019/git-issue-activity/projects/1
- Assign yourself to an issue that is unassigned.
- Move the card from
To DotoIn Progress.
- Make sure you are on the Master branch:
git checkout master - Pull any changes that have ocurred since your last pull, and correct merge conflicts
git pull upstream master - Create a branch named for the issue (e.g.
issue-42), and switch to that branch:git checkout -b issue-42 - Edit the
LICENSEfile to correct the issue - Add the change
- Commit the change, with a message describing the change (include line number and correction, e.g.
Correct misspelling, line 1: UGN -> GNU) - Pull any changes that have ocurred since your last pull, and correct merge conflicts
git pull upstream master - Push the change
git push origin issue-42
- On GitHub switch to the newly pushed branch.
- Click the
New Pull Requestbutton. - Include in the pull request text a notation that it closes the assigned issue (e.g.
Closes #42) - Click
Create Pull Request - Wait for the repository owner to accept the pull request.
