Gaia/UX Branch: Difference between revisions

Gaia/UX Branch (view source)

Revision as of 16:08, 23 November 2012

16 bytes added , 23 November 2012

Moved instructions for adding UX branch upstream. Clarification: this is not needed for development.

Gbrander

canmove, Confirmed users

227

edits

@@ Line 19: / Line 19: @@
 # QA test
 # Pull request once weekly
-== Setting up the UX Branch ==
-Sign into Github, fork http://github.com/mozilla-b2g/gaia (if you haven't already).
-Add my repository as a remote to the local copy of your fork:
-    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
-Get upstream changes from `gordonbrander/ux`:
-    git fetch gordonbrander
-Create a new local branch and set it up to track the remote branch:
-    git checkout -b ux gordonbrander/ux
-If you need to update your copy of the ux branch with the latest from gordonbrander/ux:
-    git fetch gordonbrander
-    git merge gordonbrander/ux
 == How to do Development ==
@@ Line 107: / Line 82: @@
 B2G Vidyo Room<br>
 Tues @ 1:00pm-2:00pm
+== Previewing UX Branch ==
+Instructions for flashing UX branch to your phone. Note that you should '''never merge into or from the UX branch for development'''. You should always branch from master. These instructions are only for getting a local branch that you can flash to your phone.
+Sign into Github, fork http://github.com/mozilla-b2g/gaia (if you haven't already).
+Add my repository as a remote to the local copy of your fork:
+    git remote add gordonbrander https://github.com/gordonbrander/gaia.git
+Create a new local branch and set it up to track the remote branch:
+    git checkout -b ux gordonbrander/ux
+If you need to update your copy of the ux branch with the latest from gordonbrander/ux:
+    git fetch gordonbrander
+    git merge gordonbrander/ux