search

dirac-institute / trailblazer

An open data repository for astronomical data products affected by satellites
MIT License
8 stars 2 forks source link

Generalize query function #40

Closed Jasminewatt2100 closed 2 years ago

Jasminewatt2100 commented 2 years ago

Fall 2021 quarter progress: wcs information added to the query result table.

mrawls commented 2 years ago

Extend query webpage to handle more fields

mrawls commented 2 years ago

Actually review and merge PR 40

mrawls commented 2 years ago

I didn't realize our new Trello board would post comments here 😄 well, this is officially on my radar again!

Jasminewatt2100 commented 2 years ago

No worries! Hope the progress is going well.

Jasminewatt2100 commented 2 years ago

I can find some time to merge it on this weekend-- just remind me the steps of merging would be great.

mrawls commented 2 years ago

Two options. One is clicking the big green button right here that says "Merge pull request"! The other option uses the command line and is what I normally do. But the end result should be the same.

cd trailblazer
git checkout main
--> (if you get a complaint about changes that haven't been committed and you're sure they're not important):
--> git reset --hard origin/generalize-query-function (force your computer's version to match GitHub's version)
--> git checkout main (for reals this time)
git pull (ensure you have all the latest stuff from the main branch)
git status (should say, "on branch main, everything is up to date," effectively)
git merge --no-ff generalize-query-function
git push
Jasminewatt2100 commented 2 years ago

I used the codes provided to merge, and seemly it was successful. Feel free to let me know if there is any issue.