Closed mcnowinski closed 6 years ago
Can you squash these commits into one commit? i.e.
git reset --soft HEAD~13 &&
git commit
Also, you will have to rebase your commit on top of the current master since there are merge conflicts; I'll gladly do this for you if you don't have the time, but I want to make sure I don't screw up some of the flat logic.
Okie dokie!
Sent via the Samsung Galaxy S7 active, an AT&T 4G LTE smartphone -------- Original message --------From: Remy Prechelt notifications@github.com Date: 2/11/18 3:02 PM (GMT-05:00) To: yerkesobservatory/atlas atlas@noreply.github.com Cc: mcnowinski mcnowinski@gmail.com, Author author@noreply.github.com Subject: Re: [yerkesobservatory/atlas] Lots of testing still required, but this is a start at the atlas flats routine... (#43) Can you squash these commits into one commit? i.e. git reset --soft HEAD~13 && git commit
Also, you will have to rebase your commit on top of the current master since there are merge conflicts; I'll gladly do this for you if you don't have the time, but I want to make sure I don't screw up some of the flat logic.
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or mute the thread.
{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/yerkesobservatory/atlas","title":"yerkesobservatory/atlas","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/yerkesobservatory/atlas"}},"updates":{"snippets":[{"icon":"PERSON","message":"@rprechelt in #43: Can you squash these commits into one commit? i.e.\r\n\r\ngit reset --soft HEAD~13 \u0026\u0026 \r\ngit commit\r\n
\r\n\r\nAlso, you will have to rebase your commit on top of the current master since there are merge conflicts; I'll gladly do this for you if you don't have the time, but I want to make sure I don't screw up some of the flat logic. "}],"action":{"name":"View Pull Request","url":"https://github.com/yerkesobservatory/atlas/pull/43#issuecomment-364782848"}}}
Don't feel like you have to merge this yet. Just wanted you to have a look. I have only tested some of the support functions for the flats routine. When the weather and telescope agree, I will do some actual testing. The config.toml and telelscope.py will come your way via Slack.