Development

Development

Git

Git SCM Docs

Working with pull requests

Grab a new copy with:

git clone git@github.com:LearningData/class.git

Start working by creating a new branch with every big or small change (self contained). Branch name is formatted as initials-current-name, example: ma-fix-broken-link. Always create branch from the latest tag available.

git pull origin master
git pull --tags
git checkout -b egg-feature-new-button tag-version

Make your changes in the code and commit:

git commit -am "descriptive commit message"

You can add new files to git with:

git add <file-name>         //or all untracked files with
git add .

When you are done you can push your changes and make a pull request in Github:

 git push origin egg-feature-new-button

Go to the Github page and click on "'''compare and pull request'''" for your new branch.

For maintainers: After a pull request is reviewed and merged you can create a new tag on the branch:

 git tag -a v0.0.2 -m "short message"
 git push --tags

Then checkout the master and pull the merged changes so you are up to date:

 git checkout master
 git pull

You can now delete the feature branch locally:

 git branch -d <your-branch-name>

Useful commands

 git status
 git diff
 git log
 git reflog

For maintainers: Tagging for a production release:

 git tag -a v2.0.2 -m "production release version 2.0.2"

List all of the tags in a repo with

 git tag -l

To see the details of a tag:

 git show v2.0.2

To checkout a specific release version then:

 git checkout tags/v2.0.2