Conversation
|
It says "this branch cannot be rebased due to conflicts" |
|
I've tried fixing it, but nothing indicates that there exists conflicts. Did you try merging it before I fixed the errors when I first opened the request? If so, it might work now. Otherwise, are there any more details about what the conflicts are? |
|
Also, if it is Saturday by your response, I will have to make changes again to fix the cycling. I'm unsure whether this will need to be checked with every new push, though. |
|
Changes should be live. |
|
Okay, I'm so sorry; I figured out the issue. My starting date was a day early, I think. The day was a Saturday, while my cycle starts on a Sunday. I've updated the starting date to this past weekend, so it should be reflective of the new cycle that was just pushed. I'll open another pull request. |
Alternating schedule means it's a two-week cycle. Started on the wrong one by accident.