anebz / boulder

Occupancy tracker for bouldering gyms
http://boulder.anebz.eu
7 stars 3 forks source link

Data for given day #15

Closed AnglinaBhambra closed 3 years ago

AnglinaBhambra commented 3 years ago

closes #8

AnglinaBhambra commented 3 years ago

hmmm I wonder why it did "Merge branch 'main' into data-for-given-day" instead of "Merge branch data-for-given-day into 'main'" ?

anebz commented 3 years ago

hmmm I wonder why it did "Merge branch 'main' into data-for-given-day" instead of "Merge branch data-for-given-day into 'main'" ?

Because (and this is not good coding practice), while you were doing changes in your branch, I pushed changes directly to main. So before we merge your branch to main, your branch has to be updated with main's changes

AnglinaBhambra commented 3 years ago

Because (and this is not good coding practice), while you were doing changes in your branch, I pushed changes directly to main. So before we merge your branch to main, your branch has to be updated with main's changes

This is a simple "git pull" - or a git fetch & rebase?

anebz commented 3 years ago

Because (and this is not good coding practice), while you were doing changes in your branch, I pushed changes directly to main. So before we merge your branch to main, your branch has to be updated with main's changes

This is a simple "git pull" - or a git fetch & rebase?

Huh you got me there. I don't know 😅 for sure it's not a simple git pull

AnglinaBhambra commented 3 years ago

okay, I think this is a rebasing thing, but I'm still figuring out how to do that

anebz commented 3 years ago

I found a way in the streamlit docs to set a min and max value to the date input: image