Rebase on master and fix conflicts#12
Conversation
|
Whoa... I am not entirely sure what to do with this. I think I have to do the rebasing myself, because I can't just merge this. I'm not sure github really supports friendly rebasing. @bsipocz, do you know anything about this? |
|
Yes, maybe better to fix this in your hitran branch. You could discard e5c3ace to rebase without conflicts and these changes can be added later.. |
|
OK, I rebased. Now these match... |
|
Weird... I think this PR is broken. I'm pretty sure both branches are identical except for commit names. |
|
Sorry, I think the commit hashes changed when I rebased the branch. We can close this PR now? |
|
I think so. You should double-check by rebasing against my branch and see if it goes to zero changes |
|
Yes, that worked! Pushig the rebased branch closed this PR automatically. |
When you rebase, you need to force push the rebased version. But here you wanted to rebase the original branch in the fork compared to master in the main repo. To do that you need to have commit rights to @keflavich's branch to force push back the rebase. So it's expected not to work. |
# This is the 1st commit message: add HiGal module more cleanup add changelog it is possible for a cutout to be missing; we need to allow for that. Also, the hack I had before isn't needed when you appropriately query for multiple wavelengths remove some comments, still not done with the PR minor correction added basic docs pep8 fixes. The bracket closures DO match the indentation, though. pep8 lies sometimes. add local tests and cleanup some testing more interactive tests revealed that my hacks didn't really work, this commit has some fixes move everything into astroquery.herschel.higal update relative paths whitespace # This is the commit message #2: update tests # This is the commit message #3: the higal server genuinely isn't showing anything when I search online now # This is the commit message #4: add HiGal module # This is the commit message #5: more cleanup # This is the commit message #6: add changelog # This is the commit message #7: it is possible for a cutout to be missing; we need to allow for that. Also, the hack I had before isn't needed when you appropriately query for multiple wavelengths # This is the commit message #8: remove some comments, still not done with the PR # This is the commit message #9: minor correction # This is the commit message #10: added basic docs # This is the commit message #11: pep8 fixes. The bracket closures DO match the indentation, though. pep8 lies sometimes. # This is the commit message #12: add local tests and cleanup some testing # This is the commit message #13: more interactive tests revealed that my hacks didn't really work, this commit has some fixes
I have rebased the hitran branch on master and fixed the conflicts in
CHANGESanddocs/index.rst.