Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Add EffectiveAreaTable exporter to EffectiveAreaTable2D #276
Thanks for finishing this up. I've left some more inline comments.
When you addressed those, please change the issue title to something like "Implement EffectiveAreaTable2D.to_effective_area_table" and add an entry to the changelog
Then this is ready to be merged.
@kingj90 - Yes, I'd prefer you resolve the merge conflict yourself. One advantage is less work for me, another is that travis-ci will re-run the tests.
You have to rebase on master. How to do it a bit depends on how you work with the upstream master branch locally, i.e. what exactly your git workflow is.
The recommended procedure for Astropy is here
I use this:
You might want to make a copy of your gammapy folder before ... it's not unheard of that people git in a pickle on their first few rebases. :-)
@kingj90 – I think you addressed my last comment in 4357848 on Jun 24.
By now, there's a merge conflict, so you have to rebase on master so that travis-ci runs the tests again and so that the green merge button appears for me to click.