search

thomasjacquin / allsky-portal

A simple, responsive web interface to control an allsky camera connected to a Raspberry Pi
GNU General Public License v3.0
34 stars 22 forks source link

Add "newexposure" to ZWO configuration file #31

Closed EricClaeys closed 3 years ago

EricClaeys commented 3 years ago

Thomas,

The allsky-portal dev branch is 6 commits ahead and 2 behind the master.

Eric

thomasjacquin commented 3 years ago

hmm... usually, the branch merged into master gets deleted. I just leave it around so people can commit to it.

You could merge origin/master into the dev branch and I think that would fix it.

git fetch
git checkout dev
git merge origin/master
git push

That should update the dev branch and bring it up to date with master.

EricClaeys commented 3 years ago

Thomas,

Since you created the dev branch I haven’t been using my own fork – I just commit to the allsky, allsky-portal, and allsky-website dev branches. They are the ones that are out of sync with the corresponding master branches.

I’ve never had any luck using the “git” command on my PC since it doesn’t seem to update the website’s GitHub.

Eric

From: Thomas Jacquin @.> Sent: Thursday, September 2, 2021 2:06 PM To: thomasjacquin/allsky-portal @.> Cc: EricClaeys @.>; Author @.> Subject: Re: [thomasjacquin/allsky-portal] Add "newexposure" to ZWO configuration file (#31)

hmm... usually, the branch merged into master gets deleted. I just leave it around so people can commit to it.

You could merge origin/master into the dev branch and I think that would fix it.

git fetch git checkout dev git merge origin/master git push

That should update the dev branch and bring it up to date with master.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/thomasjacquin/allsky-portal/pull/31#issuecomment-911974555 , or unsubscribe https://github.com/notifications/unsubscribe-auth/AT2PYKZRXR4BPBDKLPLK5I3T77DLLANCNFSM5DH3SDBQ . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub . https://github.com/notifications/beacon/AT2PYK4SDKMBB557F7LA3JLT77DLLA5CNFSM5DH3SDB2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOGZN2BGY.gif

thomasjacquin commented 3 years ago

@EricClaeys I delete the origin/dev branch. I believe it will create a new one the next time you push your changes. It it doesn't work, let me know and I'll manually re-create a new one.