From 47ce621045eaf1202c5834e1ddaad6b2c3bdd994 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 7 Dec 2015 10:17:24 +0000 Subject: [PATCH] akwizgran created page: Roadmap --- development-workflow.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/development-workflow.md b/development-workflow.md index cabe91d..e502c33 100644 --- a/development-workflow.md +++ b/development-workflow.md @@ -7,7 +7,8 @@ Branches * Howls of outrage: you can't rebase a public branch! * But nobody else is working on it so it's actually fine * You can use `git push -f` to overwrite the remote branch after rebasing -* When your branch is rebased onto master, open a merge request + * You can skip rebasing if there are no merge conflicts +* When your branch is ready to merge, open a merge request * At least one other person must review your code before it's merged to master * Don't push directly to master unless it's an emergency and the change is very simple * Once your branch has been merged you can delete the remote branch @@ -27,8 +28,8 @@ Issues Meetings -* At the start of each week, please let the team know roughly what hours you'll be working via the standup channel -* At the start or end of each day (whichever's closer to 10am UTC), please post an update to the standup channel saying: +* At the start of each week, let the team know roughly what hours you'll be working via the standup channel +* At the start or end of each day (whichever's closer to 10am UTC), post an update to the standup channel saying: * What you worked on yesterday/today * What you'll be working on today/tomorrow * Any blockers