Labs/Jetpack/FlightDeck/Contribution: Difference between revisions
< Labs | Jetpack | FlightDeck
Jump to navigation
Jump to search
(repository changed) |
(URL fixed) |
||
Line 19: | Line 19: | ||
#Create github account | #Create github account | ||
#Fork from the official [http://github.com/mozilla/FlightDeck main repository] | #Fork from the official [http://github.com/mozilla/FlightDeck main repository] | ||
#Install FlightDeck on your machine - [http://github.com/ | #Install FlightDeck on your machine - [http://github.com/mozilla/FlightDeck/blob/master/INSTALL Install instruction] - from your repository, assuming your username is john it is: <pre>git clone git@github.com:john/FlightDeck.git</pre> | ||
#Add main repository to remote repositories <pre>git remote add main git://github.com/mozilla/FlightDeck.git</pre> | #Add main repository to remote repositories <pre>git remote add main git://github.com/mozilla/FlightDeck.git</pre> | ||
Revision as of 10:10, 2 August 2010
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.
How to start
We do work on github, but certainly we don't want to limit the user experience to github only. Feel free to use the server you like the most.
- Create github account
- Fork from the official main repository
- Install FlightDeck on your machine - Install instruction - from your repository, assuming your username is john it is:
git clone git@github.com:john/FlightDeck.git
- Add main repository to remote repositories
git remote add main git://github.com/mozilla/FlightDeck.git
How to commit
- checkout to the master branch
git checkout master
- fetch current remote branches
git fetch
- Findor create bug in bugzilla
- check if the bug branch is already created
git branch -r
if so - use it to create your branchgit checkout -b bug-12345-name_of_the_feature main/bug-12345-name_of_the_feature
else create a new branchgit checkout -b bug-12345-name_of_the_feature
- code
- commit changes
- push to your repository
git push origin bug-12345-name_of_the_feature
- provide the link to the commit in bugzilla
- switch back to master branch
git checkout master
If this is a fix to the current production system and it has to be implemented immediately please use the hotfix prefix instead of the bug one. Like hotfix-12345-name_of_the_fix.
Merging
Please always add --no-ff
if using git merge