canmove, Confirmed users
227
edits
Line 8: | Line 8: | ||
== Process == | == Process == | ||
* Update UX Branch Daily | * Update the UX Branch Daily by fetching and merging from upstream/master | ||
* Review pull requests 2-3 times a week | * Review pull requests 2-3 times a week | ||
** | ** Check bug in Bugzilla. | ||
** | ** Priority is given to commits that address bugs in: http://bit.ly/TE1jzg | ||
** Add Status Whiteboard "uxbranch" (if it doesn't have the tag already) | ** Add Status Whiteboard "uxbranch" (if it doesn't have the tag already) | ||
** Only one commit per fix! | |||
** Make sure commit message is in correct format and has a bug number. If commit message is incorrect, we must make sure to fix it when we cherry-pick the commit at the end of the week (see below). If necessary, apply as patch and fix commit message. | |||
** Review patch, understand risk-level of patch | ** Review patch, understand risk-level of patch | ||
** Apply patch locally and test on-device | ** Apply patch locally and test on-device | ||
** If all is OK, merge pull request. | ** If all is OK, merge pull request. | ||
** Add Status Whiteboard "landed in uxbranch" | ** Add Status Whiteboard "landed in uxbranch" | ||
* Create a pull request for qa-verified bugs every week. | * Create a pull request for qa-verified bugs every week. | ||
Line 23: | Line 24: | ||
** Include links to bugs in pull request message. | ** Include links to bugs in pull request message. | ||
Note: you can get the original commit for a merge by clicking on the right-hand parent commit. | Note: you can get the original commit for a merge by clicking on the right-hand parent commit. | ||