Versions Compared

Key

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

...

  • goto master and get the most recent updates
  • create a new feature branch to work in (remember never work in master)
  • switch to the feature branch if needed
  • work on your local feature, creating as many commits as needed
  • once you are happy with your changes and believe it is ready for inclusion in sakai's project (upstream) squash your commits into 1 commit
  • push your changes to origin in a branch typically with the same name
  • next issue a pull request (PR) from your feature branch in origin to upstream master
  • if review is needed this is the time for other others to review your changes
    • if further changes are required you switch to your local branch make the changes and commit and then push them to the same branch in origin that the PR was issued from and PR will be updated automatically.
    • repeat this step until changes are satisfactory
  • if review is complete then the PR is merged
  • optional branch can be deleted in origin when PR is merged