From 3f62d401db36f454c5be2315559e4b60997d570a Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 13 Apr 2016 10:45:07 +0000 Subject: [PATCH] --- development-workflow.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/development-workflow.md b/development-workflow.md index e08c212..91bb3e4 100644 --- a/development-workflow.md +++ b/development-workflow.md @@ -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'