Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 15:19:53 +01:00
Code Issues Projects Releases Wiki Activity

akwizgran created page: Roadmap

akwizgran
2015-12-07 10:17:24 +00:00
parent 1242c5b647
commit 47ce621045
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
development-workflow.md

@@ -7,7 +7,8 @@ Branches
* Howls of outrage: you can't rebase a public branch! * Howls of outrage: you can't rebase a public branch!
* But nobody else is working on it so it's actually fine * 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 * 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 * 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 * 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 * Once your branch has been merged you can delete the remote branch
@@ -27,8 +28,8 @@ Issues
Meetings 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 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), please post an update to the standup channel saying: * 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 worked on yesterday/today
* What you'll be working on today/tomorrow * What you'll be working on today/tomorrow
* Any blockers * Any blockers