Whakatau mai!
By now, you should have completed the following basic tasks within your own my-git-tutorial
repository, or are confident enough to proceed:
- Repository creation with GitHub
- Editing a file directly on GitHub
- Cloning a repository to your local machine
- Editing a file on your local machine and pushing it upstream (to the remote, which is GitHub)
- Fetching and pulling upstream changes to your local machine
- Auto-merging of a file that was simultaneously edited in two places
- Manually resolving a simple merge conflict
This template repository is now provided for you to practice using GitHub's project management features, which you may find helpful towards completing your ELECTENG/COMPSYS 209 project.
This repository will also walk you through some more examples of branching and conflict resolution.
Within your project, you may choose to use:
GitHub Feature | Potential Application |
---|---|
Projects | To get a big-picture view of all the tasks within your project, and their statuses. |
Issues | To track each individual project task. |
Wikis | To store your team contract, meeting agendas/minutes, team logbooks, theoretical calculations, technical documentation, etc. |
Pull Requests | To review new changes as a team before they are merged into main . |
Note
You are not limited to just these.
- Click the
Use this template
button beside the repository description. - Select
Create a new repository
. - Select your own username as the
Owner
, and name the repositorymy-github-tutorial
. - Ensure the
Include all branches
checkbox is selected.Warning
It is very important thatInclude all branches
is selected! - Click
Create repository from template
. - Complete the tasks laid out in the Wiki.
For help on using Git and GitHub, you may:
- Refer to the
Getting Started with GitHub
workshop provided on Canvas - Ask a TA for help
- Refer to https://git-scm.com/book/en/v2