mytardis/mytardis — comment on commit 4afc3004c974269a0deab369ca7f0f7862c32b2e
File:  line 0
By tjdett:

Steve, I'm sorry, but I don't like this merge.

1. You show up as the author for all of it (which sucks for locating the original author of the code).
2. You've merged together all the commits. Most of my commits changed individual things, so that a subsequent `git-revert` could reverse one change without reversing everything in the pull request. In some cases where I found bugs later, I used `git-rebase` to "fixup" the relevant commits rather than jumble things together.
3. You've pretty much omitted all my javascript tests (and any of the JS cleanup I did).

I'm happy to wait a week or two if necessary, but can we please go back and merge this properly. If you don't like the JS work currently, just pull in Celery for now and I'll rebase the rest for your review later.