Labs/Jetpack/FlightDeck/Contribution: Difference between revisions
< Labs | Jetpack | FlightDeck
Jump to navigation
Jump to search
(contributing to release branches) |
m (→How to commit) |
||
Line 29: | Line 29: | ||
#fetch current remote branches <pre>git fetch</pre> | #fetch current remote branches <pre>git fetch</pre> | ||
#[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 | #[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 <pre>git branch -r</pre>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> | #check if the bug branch is already created <pre>git branch -r</pre> | ||
#*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 | #code | ||
#commit changes | #commit changes |
Revision as of 15:01, 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 branch you want to fix
- master for current development
git checkout master
- release-# branches for fixing the release
git checkout release-1.0a3
- master for current development
- 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 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
- if so - use it to create your branch
- 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