Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

You can send in diffs of your changes to the Cloudstack development mailing list, where your diffs will be reviewed and committed to the master branch that syncs up often with the external public git branch.

The master git branch is what Apache Cloudstack developers at Citrix work with. To clone this branch, you will need to do -

...

        git checkout master

Step 2) Pull the 3.0.x branch -

        git checkout 3.0.x

The output will show -

"
Branch 3.0.x set up to track remote branch 3.0.x from origin.
Switched to a new branch '3.0.x'"

Step 3) Confirm you are on the 3.0.x branch -

        git branch

The output will show -

"
* 3.0.x
master"

Step 4) Either make your changes on this branch (for a simple bugfix patch), or, create a new local branch from this 3.0.x branch master -

$ git checkout -b my-feature
Switched to a new branch 'my-feature'

Step 53) Confirm that you are on your new my-feature branch -

$ git branch
3.0.x
master 
* my-feature

Step 6) Make your changes to the new my-feature branch, and git commit your changes.

...

             I) pushing your changes to the 3.0.x master branch which you pulled:

                Case a) You made changes to the local "3.0.xmaster" branch without creating a "my-feature" branch:

...

                              ii) git checkout 3.0.x{}

                              iii) git cherry-pick <commit_number_bottom-most> .. .. .. <commit_number_top-most>

...