Pulling Guide

SomeUser has made a cool new feature on their fork, someuser/cool-feature, and has filed a pull request (with id pull-id) to get the code into UKHAS mainstream!

Great, but how do you pull?

    $ git checkout develop
    $ git status
    # On branch develop
    nothing to commit (working directory clean)

Don't get the above? Stop and check your develop branch is clean!

    $ git fetch ukhas
    $ git merge --ff-only ukhas/develop

Didn't merge successfully? You have local commits to develop which should have been pushed to UKHAS. Rebase them from the latest UKHAS develop (git rebase ukhas/develop develop) and push them first, then continue here.

    $ git fetch someuser
    $ git merge --no-ff -m "Pulling SomeUser's cool feature into mainstream. Closes **pull-id**" someuser/cool-feature

Now you've merged their code locally, it's time to check it out! Run nosetests, make sure the code has copyright headers, etc. You can also inspect the code from the github pull request page, which shows changes in the commits to be pulled. As the person pushing the code to UKHAS, you're also responsible for checking it passes tests.

    # All ready?
    $ git push ukhas develop