Revision as of 00:10, 22 July 2010

	THIS PAGE IS A WORKING DRAFT
	The page may be difficult to navigate, and some information on its subject might be incomplete and/or evolving rapidly. If you have any questions or ideas, please add them as a new topic on the discussion page.

Overview

Changes should follow Style Guide
All changes should be accompanied with test (no front-end tests yet)
Development should be done on Github
Every change should have a corresponding bug in bugzilla
Every change should be developed in a specific branch named bug-12345-human_readable where 123245 is a number of the bug
There is a number of developers who are able to merge and push from the private branch to the main repository
Production branch is for production only and it is merged from devel only

If you have questions, ask in #jetpack on IRC or on the Jetpack mailing list. You may also like to read the Code Workflow document.

Add main repository to remote repositories

git remote add main git://github.com/zalun/FlightDeck.git

check if the bug branch is already created, if so - use it to create your branch

git checkout -b bug-12345-name_of_the_feature main/bug-12345-name_of_the_feature

else create a new branch

git checkout -b bug-12345-name_of_the_feature

push to your repository

git push origin bug-12345-name_of_the_feature

Please always add --no-ff if using git merge

@@ Line 23: / Line 23: @@
 #[https://bugzilla.mozilla.org/buglist.cgi?emailreporter2=1&emailtype2=exact&resolution=---&emailcc2=1&query_format=advanced&emailqa_contact2=1&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=REOPENED&email1=flightdeck%40mozilla.com&emailassigned_to1=1&emaillongdesc2=1&component=FlightDeck&product=Mozilla%20Labs Find]or [https://bugzilla.mozilla.org/enter_bug.cgi?product=Mozilla%20Labs&component=FlightDeck create] bug in bugzilla
-#check if the bug branch is already created, if so - use it to create your branch <pre>git checkout -b bug-12345-name_of_the_feature main/ug-12345-name_of_the_feature</pre> else create a new branch <pre>git checkout -b bug-12345-name_of_the_feature</pre>
+#check if the bug branch is already created, if so - use it to create your branch <pre>git checkout -b bug-12345-name_of_the_feature main/bug-12345-name_of_the_feature</pre> else create a new branch <pre>git checkout -b bug-12345-name_of_the_feature</pre>
 #code
 #commit changes