Skip to content

Conversation

@elsa-bismuth
Copy link
Contributor

Update streak computation

♻️ Current situation & Problem

let's until midnight to complete streak before it resets to 0

⚙️ Release Notes

Add a bullet point list summary of the feature and possible migration guides if this is a breaking change so this section can be added to the release notes.
Include code snippets that provide examples of the feature implemented or links to the documentation if it appends or changes the public interface.

📚 Documentation

Please ensure that you properly document any additions in conformance to Spezi Documentation Guide.
You can use this section to describe your solution, but we encourage contributors to document your reasoning and changes using in-line documentation.

✅ Testing

Please ensure that the PR meets the testing requirements set by CodeCov and that new functionality is appropriately tested.
This section describes important information about the tests and why some elements might not be testable.

📝 Code of Conduct & Contributing Guidelines

By submitting creating this pull request, you agree to follow our Code of Conduct and Contributing Guidelines:

@elsa-bismuth elsa-bismuth self-assigned this Mar 7, 2025
@kkellybonilla
Copy link
Contributor

kkellybonilla commented Mar 7, 2025

this pr has a ton of old commits which is part of why there are so many conflicts, can we fix this up?

This branch is 7 commits ahead of, 15 commits behind main.

the way to do it would be:

  1. make sure you're working directory is clean!!! do a git status and ensure there's no changes. if any, commit them to a branch (no need to push).
  2. git checkout main
  3. git pull origin main (keep doing this until nothing else pulls in)
  4. git checkout -b elsa-bismuth/streak (if you still have this branch locally, rename your local version because we want a new one here that has everything from main)
  5. git reset --hard HEAD~15 (because its 15 commits behind main, if it gets further behind, this number will need to be updated)
  6. git pull origin elsa-bismuth/streak
  7. git reset --soft HEAD~1 (bringing your latest commit which is what we actually want to merge back to the staging area)
  8. git stash (save these changes by putting them away in your stash)
  9. git reset --hard HEAD~6 (this gets rid of the 6 commits that this branch is "ahead of main" by yet have already been merged unbeknownst to this branch)
  10. git pull origin main (yuh! getting you up to speed with main)
  11. git stash pop (adding your changes back and now we can handle the likely minimal merge conflicts locally :) )
  12. resolve merge conflicts locally if any
  13. git add .
  14. git commit -m "correct streak computations"
  15. git push origin elsa-bismuth/streak -f

Copy link
Contributor

@kkellybonilla kkellybonilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check out the comment i left about how to fix this branch up before merging. we can also hop on a zoom and do it together if you're scared to mess anything up lol

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants