search

LowellObservatory / NightWatch

A system to display a set of important information at an observatory.
2 stars 0 forks source link

Merge alpha branch onto master, and begin deployment #17

Closed astrobokonon closed 5 years ago

astrobokonon commented 5 years ago

Pardon the avalanche of commits - in the future it might be good to squash locally and then push, but I think we're all green enough with git that such a workflow might be asking too much.

giphy2

astrobokonon commented 5 years ago

At this point I have three options:

image

I'll try "squash and merge" for the bokeh branch, probably, since that will make more sense as a mega-commit rather than this piecemeal thing I've done to transform the initial tests into a working prototype.