Blockly is a web-based, graphical programming editor. Users can drag blocks together to build an application. No typing required. Credit goes to these awesome developers and a small army of translators.
This repository contains the source code for the Blockly based 20 hour curriculum and Hour of Code. Information about Blockly can be found in the wiki.
- Fork and clone this Repository.
- Add this repo as a remote:
git remote add codedotorg https://github.com/code-dot-org/blockly.git - [Hack]
- Merge in most up-to-date changes, repeat as needed:
git fetch codedotorg mastergit merge codedotorg/master- Push changes to your fork, repeat as desired.
- Initiate pull request on your fork's page, targeting this repository.
- Find the pull request you initiated and assign it to someone. This requires that you are a collaborator on the project.
- After submitting a pull request, start a new branch with
git checkout -b new_feature. This allows you to keep working without affecting the pull request. - Once you have forked your own repository, you can makes as many commits, and push them to github, as you like. These will be pushed to your own repo and won't affect this shared repo.
- Once you have issued a pull request any additional pushes you make to your repo will automatically update the pull request. This is like running gcl update multiple times for the same change list.
- Use
git rebase --interactiveto clean up messy commits before issuing a pull request.