Make the power tests pass

[ghost]

There are a few todos around the return values not matching the docs but the tests need them to pass so will need to find the proper set of flags from somewhere. Also made it not use the param stuff so much, which may or may not need closer looking at in the future.

[hrydgard]

Oops, I fixed this too in the meantime :) I'll have to do some conflict resolving, i like your param improvements.

[ghost]

haha, typical :)

Let me know if I can help.

[hrydgard]

Done

[hrydgard]

Btw, rebase on master the next time you send a pull request, we ended up with some duplicates commits in the history now :)

[ghost]

Yes. I'm quite bad at git so thanks for pointing that out. Probably should have read the docs before sending a pull request ;)

[ghost]

Is there an easy way to rebase to your master branch? Or is it just a case of deleting my fork? If I try and do:
git update upstream
git merge upstream/master

it ends up duplicating the commits. I've been using source control forever and this is making me feel very stupid :)

[Jessidhia]

Git has a concept of an "upstream" branch, and whenever you run most updating commands without arguments, it does the right thing. Set your branch's upstream using git branch --set-upstream master upstream/master.

Since you were doing development on master, when updating the code you should do git pull --rebase, which automatically deduplicates commits, and lets you fix merge conflicts commit-by-commit. Ideally, you should do development on a so-called "topic" branch. See http://nvie.com/posts/a-successful-git-branching-model/ for an example of git workflow.

[ghost]

That actually makes a lot of sense, especially the topic branch idea. I'll give it a go next time. Thanks!

[hrydgard]

I need to start using topic branches more, too :) Thanks for the explanation Kovensky.