Getting started with A2
All work to be added, committed and pushed to the remote by 11:59PM the day of the lab!!
IMPORTANT: While you are in the lab, login in to a lab desktop, bring up chrome and visit
this attendance app
This will register your attendance in the lab.
Notes
- During the lab, if you know what you are doing, and can help your neighbour, then help them. If you need help, ask us or your neighbour.
The steps
NOTE: In general, before working on a repo, make sure to git pull!!!
NOTE: Visit
Assignment 2, we will be covering up to and
incuding section Notes for Sprint 1 of the assignment.
<![CDATA[
0) Organize 3-4 people in the same lab section into a single group.
Use the minimum of your group numbers as the new final group.
Each group member does the following
1) visit https://cs.utm.utoronto.ca/~ta/207/25f/groups/
and join the target group. It takes some time for the repo to be updated, so be patient.
2) git clone https://UTORID@mcsscm.utm.utoronto.ca:9999/git/207/25f/repo_a2_NNN.git
3) cd repo_a2_NNN
4) vim members.txt # and dropped in
member1: UTORID NAME CONTACT_INFO
member2: UTORID NAME CONTACT_INFO
member3: UTORID NAME CONTACT_INFO
member4: UTORID NAME CONTACT_INFO
5) Enter your UTORID NAME and CONTACT_INFO in members.txt
6) Add, commit and push. If you have a merge conflict,
now is a good time to learn how to resolve it.
One group member does the following:
7) git pull
8) Download Assignment2.zip from the assignment web page
9) unzip ~/Downloads/Assignment2.zip
10) Now my repo looks like...
$ ls repo_a2_NNN/
Assignment2 members.txt
11) add, commit and push
Each member of the group can now
12) git pull
13) run IntelliJ and then Open the Assignment2 project
NOTE: DO NOT OPEN THE REPO, OPEN Assignment2 in IntelliJ
+---------------------------------------------------+
|TAs will review the paint program with you briefly.|
+---------------------------------------------------+
14) Try running Paint
15) Pick a US or BUG from sprintBacklog1.txt to work on. This means you should
modify sprintBacklog1.txt as well as productBacklog.txt, put your utorid
on the user story and (since we did not do this earlier) put an estimate on it.
16) Add, commit and push the changes to the master branch
17) branch on the US/BUG, and switch to that branch.
18) do a bit of work on that branch and add, commit and push it
19) make sure the upstream is set properly so you can push the local branch to a remote branch
of the same name
TUTORIAL ENDS HERE!!!
20) Continue working on the US/BUG till it is complete. Adding and committing and pushing
this branch along the way. You should have no conflicts since you are the only one
working on this branch!!
21) When finished make sure to manage sprintBacklog1.txt and productBacklog.txt
22) add, commit and push the branch.
23) Switch to master
24) Merge your branch into master, making sure that everything works!!
25) Add, commit and push to the remote.
...
Complete any other BUG/US you have taken this sprint.
]]>
To sum up: at this point you should...
- Be in a group consisting of 3-4 lab members. All group members must be in the same lab.
- Have cloned your repo
- Added yourself to members.txt
- Claimed a user story
- Modified productBacklog.txt and sprintBacklog1.txt to indicate that you are working on that user story.
- Branched on that user story
- Begun working on that user story
- Modify some files, add, commit and push on your branch
This is what we expect to see by midnight on the day of your lab. We don't expect that you will have completed the user story,
just that you have the environment setup and know how to move forward.