User Tools
Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
cs:sw_workflow:start [2016/08/21 19:39] Brandon Kallaher |
cs:sw_workflow:start [2022/04/15 02:13] Chris Nathman remove software workflow |
||
|---|---|---|---|
| Line 14: | Line 14: | ||
| - Grab an issue from the current sprint that is assigned to you. If no issues are assigned to you, you can pick out one that is not assigned to anyone, or talk to the team lead, who can help you find a task. | - Grab an issue from the current sprint that is assigned to you. If no issues are assigned to you, you can pick out one that is not assigned to anyone, or talk to the team lead, who can help you find a task. | ||
| - | - Check out your own branch on git, work on the code, make commits, rebase on dev often, make comments on the issue on github as necessary. | + | - Check out your own branch on git, work on the code, make commits, rebase ontop of master often, make comments on the issue on github as necessary. |
| - When you think the work is completed, create a pull request on Github | - When you think the work is completed, create a pull request on Github | ||
| - A code review is performed via Github's pull request framework | - A code review is performed via Github's pull request framework | ||
| - Perform any changes resulting from the code review | - Perform any changes resulting from the code review | ||
| - | - After the review is completed, the git manager will fast-forward merge our dev branch into your branch, and the pull request and issue can both be closed. | + | - After the review is completed, the git manager will fast-forward merge our master branch into your branch, and the pull request and issue can both be closed. |
| - Go back to step 1! | - Go back to step 1! | ||
| ====== Code Review/Pull Request Policy ====== | ====== Code Review/Pull Request Policy ====== | ||
| - | The team lead will be the head of all code reviews, but anybody can participate. The more people looking at the code, the more likely we are to discover bugs before we do a pool test. All code should undergo review before being integrated to the dev branch Exceptions are allowed at the discretion of the team lead for small, quick fixes where the overhead of a review is not necessary. | + | The team lead will be the head of all code reviews, but anybody can participate. The more people looking at the code, the more likely we are to discover bugs before we do a pool test. All code should undergo review before being integrated to the master branch. Exceptions are allowed at the discretion of the team lead for small, quick fixes where the overhead of a review is not necessary. |
| ====== Labels ====== | ====== Labels ====== | ||
