Credits for Rob Tovey

[pc494]

A good portion of our simulation code comes from @robtovey, but isn't ascribed to him by github yet. It would be nice to fix this.

[dnjohnstone]

Yeah... do we know how to do this? I guess @robtovey committed from an odd account or something...

[robtovey]

So for some reason when I was committing from my laptop it somehow hasn't realised which account to use and has used my laptop name instead of an email address...

I think this puts me in the Unrecognized author (no email address) category. Unfortunately there isn't a fix for this, just advice on how to stop it in the future.

I don't mind what happens now, I could add a comment line to each of the files I created to make some 'claim' and give a contact address? This should document the contribution in text and (to some extent) by github.
Other suggestions are welcome, I'm not worried from a personal point of view but I guess it's better that the right things are linked to the right person.

[dnjohnstone]

I think the only option I can see at this point is for you to delete the code you added and commit, then commit adding it back? Which would at least get the lines linked to you, but sounds stupid...

[pc494]

I think the only option I can see at this point is for you to delete the code you added and commit, then commit adding it back? Which would at least get the lines linked to you, but sounds stupid...

If you wouldn't mind @robtovey this would be my strong preference.

[robtovey]

ok, I think the best thing to do is try to revert my commit back to the initial branch and then jump to the point at which it was merged.
I think that whatever happens, it's going to need careful merging back into the main stream but hopefully just repeating old commits will keep things as simple as possible.

@dnjohnstone, if I go for d83a810 (your big merge) I think the only things I might be unfairly claiming credit for is a couple of formatting edits. Do you mind? Otherwise I could go for the one before ad3dc68?

[dnjohnstone]

Go for it - I'm really not bothered about number of commits :)

[robtovey]

Ok, as far as I can tell things are all in the right place now
A couple of conflicts you will have to look through but hopefully everything makes sense.