Contributor

PR Summary

PR Checklist

• Has pytest style unit tests (and pytest passes).
• Is Flake 8 compliant (run flake8 on changed files to check).
• New features are documented, with examples if plot related.
• Documentation is sphinx and numpydoc compliant (the docs should build without error).
• Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
• New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
• API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

Contributor Author

Ah, it appears as though I had commits from other contributors from the upstream included. I'm not quite sure how to deal with those at the moment.

Contributor Author

I think what I had tried to do made it much messier with all of the items in Files Changed from the soft reset of commits.

Contributor Author

Ugh, I knew I messed up again... I couldn't remember how to rebase properly with my original local branch and now it's back to the messed up problem I had before. I apologize for dropping the ball on this PR.

Member

Is alright, git is a massive pain. Ping on gitter as needed!

Member

Until you know what you are doing, always back your branch up before doing a rebase. Then you can repeat until you get it right.