Skip to content

Fixed Lakeside First Cycle#59

Merged
arjunpat merged 6 commits intoarjunpat:masterfrom
kaiserc07:master
Feb 26, 2026
Merged

Fixed Lakeside First Cycle#59
arjunpat merged 6 commits intoarjunpat:masterfrom
kaiserc07:master

Conversation

@kaiserc07
Copy link
Contributor

Alternating schedule means it's a two-week cycle. Started on the wrong one by accident.

@arjunpat
Copy link
Owner

It says "this branch cannot be rebased due to conflicts"

@kaiserc07
Copy link
Contributor Author

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?

@kaiserc07
Copy link
Contributor Author

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.

@arjunpat arjunpat merged commit 607867e into arjunpat:master Feb 26, 2026
1 check passed
arjunpat added a commit that referenced this pull request Feb 26, 2026
@arjunpat
Copy link
Owner

Changes should be live.

@kaiserc07
Copy link
Contributor Author

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.

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.

2 participants