Teacher merge feature - Githubissues

beautyjoy / BJC-Teacher-Tracker

Access Portal and Dashboards for BJC Teachers

https://teachers.bjc.berkeley.edu

1 stars 8 forks source link

Teacher merge feature #306

Closed ArushC closed 5 months ago

ArushC commented 5 months ago

Pivotal Tracker Link

What this PR does:

TODO -- don't look at this PR yet

This pull request fixes|implements (pick one...) __.

Include screenshots, videos, etc.

Who authored this PR?

How should this PR be tested?

Is there a deploy we can view?
What do the specs/features test?
Are there edge cases to watch out for?

Are there any complications to deploying this?

Checklist:

[ ] Has this been deployed to a staging environment or reviewed by a customer?
[ ] Tag someone for code review (either a coach / team member)
[ ] I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay) (e.g. michael/12345-add-new-feature Any branch name will do as long as the story ID is there. You can use git checkout -b [new-branch-name])

ArushC commented 5 months ago

Closing this PR due to merge conflicts that were incorrectly resolved. I'm going to revert the branch and reopen it later.