amorilia/blender_nif_plugin — pull request #14 by amorilia (2012-10-19 16:35:46+00:00)
Title: Collision refactor.

@neomonkeus

Can't send it to you because this is technically already merged into your develop. :)

Anyway, looks good to me - anything else you wanted to add to it, or ok to merge?

Aside, you can reset your develop branch with:

git fetch amorilia
git checkout develop
git reset amorilia/develop --hard
git push origin +develop

Aside, if you find that you've committed to develop by accident, you can always create a feature branch off it and reset your develop branch to your remote one:

git checkout develop -b feature/name-of-feature
git checkout develop
git reset origin/develop --hard