canmove, Confirmed users
227
edits
Gaia/UX Branch: Difference between revisions
→Setting up the UX Branch: Instructions for doing development.
No edit summary |
(→Setting up the UX Branch: Instructions for doing development.) |
||
| Line 26: | Line 26: | ||
Sign into Github, fork http://github.com/mozilla-b2g/gaia (if you haven't already). | Sign into Github, fork http://github.com/mozilla-b2g/gaia (if you haven't already). | ||
Add my repository as a remote to your fork: | Add my repository as a remote to the local copy of your fork: | ||
git remote add gordonbrander https://github.com/gordonbrander/gaia.git | git remote add gordonbrander https://github.com/gordonbrander/gaia.git | ||
While you're at it, add mozilla-b2g as the upstream to your local copy, if you haven't already: | |||
git remote add upstream https://github.com/mozilla-b2g/gaia.git | |||
Create a new local branch and set it up to track the remote branch: | Create a new local branch and set it up to track the remote branch: | ||
| Line 36: | Line 40: | ||
Getting upstream changes from `gordonbrander/ux`: | Getting upstream changes from `gordonbrander/ux`: | ||
git pull gordonbrander ux | git fetch gordonbrander | ||
git merge gordonbrander/ux | |||
== How to do Development == | |||
Ok, now that you have gordonbrander and upstream set up as remotes to your local copy, here's how you use them. | |||
All your development should be done in feature branches. Let's create one now. Start by checkout out master. '''Always branch from master, not from ux branch'''. | |||
git checkout master | |||
Update master to the latest from mozilla-b2g/gaia: | |||
git fetch upstream | |||
git merge upstream/master | |||
Create your branch. It's best to name the branch after the bug. | |||
git branch bug-777077 | |||
git checkout bug-777077 | |||
...hack, hack, hack... ok! Done! Now you'll want to push your new branch to your fork. | |||
git push -u origin bug-777077 | |||
Next, you'll want to issue a pull request to my UX branch. Copy/paste the link below, and change "yourusername:bug-777077" to your github username and your actual branch name. Then hit enter! | |||
https://github.com/gordonbrander/gaia/pull/new/gordonbrander:ux...yourusername:bug-777077 | |||
The pull request screen should load up with all the correct settings. Click "send pull request". | |||
That's it! I'll review your pull request, then fast-track it in. | |||
== Etiquette == | == Etiquette == | ||