... | ... | @@ -13,8 +13,8 @@ |
|
|
|
|
|
* At least one other person must review your code before it's merged to master
|
|
|
* You should address all the reviewer's comments before merging
|
|
|
* If a comment is better dealt with as a separate ticket after merging, create a ticket and reply with the ticket number
|
|
|
* Let the reviewer know when all the comments have been addressed
|
|
|
* If an issue needs to be fixed before merging, push the fix to your branch and let the reviewer know
|
|
|
* If an issue is better dealt with after merging, create a ticket and reply with the ticket number
|
|
|
* Once your branch has been merged you can delete the remote branch
|
|
|
* When reviewing a branch:
|
|
|
* Check out and run the code as well as reading it
|
... | ... | @@ -23,7 +23,7 @@ |
|
|
|
|
|
# Tests
|
|
|
|
|
|
* Before opening a merge request, make sure the tests still pass
|
|
|
* Run the tests before putting a branch up for review
|
|
|
* To run the tests in Android Studio:
|
|
|
* Select 'Run > Edit Configurations' from the menu
|
|
|
* Click '+' and select 'JUnit'
|
... | ... | |