search

cjaiello / Slack-Standup-Report-Bot

Python, Flask, Postgres, Slack API, Heroku. Set a daily standup time, have bot message in a channel requesting daily standup reports, and optionally have your standup report be emailed to a specified email address each day. Has instructions for local setup and Heroku setup.
4 stars 4 forks source link

Homepage template #32

Closed besnardf closed 4 years ago

besnardf commented 4 years ago

Fixes #13 and #14

cjaiello commented 4 years ago

Thank you @besnardf ! I actually had to take a bunch of commits out of master, so could you update this pull request to only have your commits? Then I can merge it!

If you need help with that, do:

git checkout dev_homepage
git checkout -b dev_homepage_temp
git checkout master
git reset --hard 6d10da6d1bdaecb3c565ea730b89d122ed05502e
git push -f
git branch -d dev_homepage
git checkout -b dev_homepage
git cherry-pick f57c43e
git cherry-pick cc2b5e3
git push -f

So this will:

  1. Ensure you're on the right branch, with your work on it
  2. Make a temp branch with your work in it
  3. Swap to master
  4. Reset the head back to where I had to do the same
  5. Push those changes (this might be unnecessary, but it could still be good to do)
  6. Delete your dev_homepage branch
  7. Make a new dev_homepage branch
  8. Cherry pick your commit off of dev_homepage_temp
  9. Cherry pick your commit off of dev_homepage_temp
  10. Force push
besnardf commented 4 years ago

Hi @cjaiello It should be good now !