Skip to content

Conversation

@LaserBread
Copy link
Contributor

Description

The repository has two login pages, one in ./client/src and one in ./client/src/pages. It seems deleting the one in ./client/src has no negative side effects when deleted, while the one in ./client/src/pages makes the app unable to build. I will see if the tests pan out.

Fixes #356

Fixes #357

Additional Information

Checklist:

Before you submit your Pull Request, please make sure you have completed the following tasks:

  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have made corresponding changes to the documentation.
  • My changes generate no new warnings.
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes. (I don't know how to do this)
  • Any dependent changes have been merged and published in downstream modules.
  • I have tagged my PR with the appropriate label(s).

Copy link
Contributor

@MigrainePanda MigrainePanda left a comment

Choose a reason for hiding this comment

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

The deleted file is fine, but you are trying to merge 8 commits into OSU-MC:development, which includes some of the previous commits you have already merged. You should sync your fork to the repo, so the PR only merges the 1 (or more) new commits.

@github-project-automation github-project-automation bot moved this from Backlog to In Progress in classroom-polling Nov 19, 2025
@MigrainePanda MigrainePanda added the development Updates and modifications to development/deployment tools label Nov 20, 2025
@LaserBread
Copy link
Contributor Author

LaserBread commented Nov 20, 2025

The deleted file is fine, but you are trying to merge 8 commits into OSU-MC:development, which includes some of the previous commits you have already merged. You should sync your fork to the repo, so the PR only merges the 1 (or more) new commits.

Wouldn't it not sync those changes automatically?

I have synced the repo multiple times, and it still thinks those 8 commits need to be merged into the repo.

@LaserBread
Copy link
Contributor Author

Trying to redo the PR

@LaserBread LaserBread closed this Nov 21, 2025
@github-project-automation github-project-automation bot moved this from In Progress to Done in classroom-polling Nov 21, 2025
@LaserBread LaserBread deleted the development branch November 21, 2025 01:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

development Updates and modifications to development/deployment tools

Projects

Status: Done

2 participants