diff options
| author | Samarth Agarwal <samarth.agarwal@mail.utoronto.ca> | 2019-03-29 22:59:58 +0000 |
|---|---|---|
| committer | Samarth Agarwal <samarth.agarwal@mail.utoronto.ca> | 2019-03-29 22:59:58 +0000 |
| commit | 686c57ced9c5113caff6f8bef8cba8816048c50b (patch) | |
| tree | 7df3a1cf0b4c14edb8b67aba50238c7c2fe73978 /deliverables/iteration-03-plan.md | |
| parent | d727ca868539d6fd69b0a0dae673c11f0653f92e (diff) | |
| parent | ad6b31fbb0e1aa09ae1560f3d504ecee84bac148 (diff) | |
Merge branch 'master' of https://github.com/csc301-winter-2019/project-team-02
Diffstat (limited to 'deliverables/iteration-03-plan.md')
| -rw-r--r-- | deliverables/iteration-03-plan.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/deliverables/iteration-03-plan.md b/deliverables/iteration-03-plan.md index 418e387..cbfcdfc 100644 --- a/deliverables/iteration-03-plan.md +++ b/deliverables/iteration-03-plan.md @@ -3,7 +3,7 @@ ## Iteration XX * Start date: Mar 12 - * End date: Mar 22? + * End date: Mar 29 ## Process @@ -11,6 +11,7 @@ * Having a dedicated day for testing so that branches are kept up to date and master is getting consistently updated with new code. We didn't do this in the last iteration and we think it led to a bunch of code conflicts. We hope that by testing regularly, we can get code pushed to appropriate places rather than letting it just sit in its branch. We will be able to see if this is effective by doing a search in GitHub commits with message "resolving conflicts". (We usually put something similar in conflict merges). + * We will create a recurring Slack reminder in the general channel which will notify us every night to check Pull Requests. Additionally, when a developer creates a new PR, they will individually notify the reviews on Slack with the link requesting for review. This is so that tasks get to the testing phase quicker, and therefore end up getting merged back into master quicker => new tasks will have the latest master. #### Roles & responsibilities @@ -48,3 +49,4 @@ Additionally, we now have staging and production deployments for the mobile side * A mobile application with the latest master branch deployed on Appetize, or a real phone (if permitted). * A interactive web application with the latest master branch deployed on Heroku. + |