GIT Development Workflow

(Difference between revisions)

Revision as of 18:03, 7 March 2012

Anything in the master branch is deployable
To implement a new features or bug fix, create a new feature branch off of master
Commit all your changes to the branch and push on the server
When you need feedback/review/help open a pull request
After testing your branch by running Firebug test suite on it, merge it into master
When doing a release create a branch off of master

The master branch should be stable.
It should be always safe to make a release from it.
If you push changes into master they must be tested by Firebug automated test suite and all tests must pass.
You should feel guilty if you break the master branch.

When you work on a new feature or fixing a bug, create a new feature branch.

First clone Firebug repo:

$ git clone git@github.com:firebug/firebug.git

Create a new myfeature branch:

$ cd firebug
$ git checkout -b myfeature master

Commit all changes into your feature branch:

$ git add <modified-file>
$ git commit -m "This is my new feature"

Push to public server (into myfeature branch):

$ git push -u origin myfeature

@@ Line 7: / Line 7: @@
 # After testing your branch by running Firebug test suite on it, merge it into <code>master</code>
 # When doing a release create a branch off of <code>master</code>
 === Master Branch ===
-The master branch should be stable. It should be always safe to make a release from it.
+* The master branch should be stable.
-If you push changes into master they must be tested by Firebug automated test suite and
+* It should be always safe to make a release from it.
-all tests must pass.
+* If you push changes into master they must be tested by Firebug automated test suite and all tests must pass.
+* You should feel guilty if you break the <code>master</code> branch.
 === Feature Branches ===