Versions Compared

Key

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

...

checkout, branch, clone, remote, rebase

Initial Simplified Sprinting Workflow

Fork https://github.com/openpentaho/Recipes to your Github account.

Clone to local directory
git clone YOUR_FORK_URL

Configure your "origin" remote to pull from the openpentaho repository, yet push to your fork.
git remote set-url origin git@github.com:openpentaho/Recipes.git
git remote set-url --push origin YOUR_FORK_URL

Go ahead and do your work in the "master" branch
Make some changes to the Margarita recipe, add a new one, whatever. Add the changes and commit
git commit -a -m "My Awesome Commit Message"

Refresh "master" with latest changes from upstream
git pull --rebase

Push your changes up to your github location
git push

Issue pull request for your work from within github

When notified that your pull request has been processed do the following:
Refresh "master" with lastest changes:
git pull --rebase

Github

fork

Development workflow