canmove, Confirmed users
227
edits
Gaia/UX Branch: Difference between revisions
→Etiquette
(→Setting up the UX Branch: Instructions for doing development.) |
|||
| Line 78: | Line 78: | ||
* File a bug for the issue. Describe it in detail. | * File a bug for the issue. Describe it in detail. | ||
* Create a local branch for each bug: `git branch | * Create a local branch for each bug: `git branch bug-xxxxx`. | ||
* Each commit message must start with the bug #: `Bug xxxxx - My Message`. | * Each commit message must start with the bug #: `Bug xxxxx - My Message`. | ||
* Rebase changes in your bug branch before issuing a pull request to `gordonbrander/ux`. See https://help.github.com/articles/interactive-rebase. We should be merging one commit per fix so that fixes can be easily cherry-picked. | * Rebase changes in your bug branch before issuing a pull request to `gordonbrander/ux`. See https://help.github.com/articles/interactive-rebase. We should be merging one commit per fix so that fixes can be easily cherry-picked. | ||
* Create a patch (diff file): `git diff > | * Create a patch (diff file): `git diff > bug-xxxxx.diff`. Attach it to the bug. | ||
* Follow any code style guidelines. | * Follow any code style guidelines. | ||
* Issue pull request to `gordonbrander/ux`. | * Issue pull request to `gordonbrander/ux`. | ||
* '''Changing JavaScript''' or working on any non-trivial commit? Go through the normal submission channels first. Issue a pull request from your | * '''Changing JavaScript''' or working on any non-trivial commit? Go through the normal submission channels first. Issue a pull request from your bug branch to mozilla-b2g/gaia, then '''also''' issue a pull request to gordonbrander/ux. '''Moral of the story: if you need it smoketested, pull request to mozilla-b2g/gaia'''. | ||
== Timeline == | == Timeline == | ||