-
Notifications
You must be signed in to change notification settings - Fork 57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Documentation:TAGrading] Version Conflict Documentation #617
Conversation
…tty/submitty.github.io into resolving_version_conflict
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Almost done!
Co-authored-by: Williams Chen <82904790+williamschen23@users.noreply.github.com>
…tty/submitty.github.io into resolving_version_conflict
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great and describes the functionality of the button perfectly; only comment is that I have another PR (Submitty/Submitty#10679) that will add another way resolve version conflicts per component by re-saving it. Do you think that should be added here, or should I put that new information in my PR?
Thanks for mentioning that, I'll add in the documentation about Submitty/Submitty#10679 here so it can be in one PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Merging this now -- even though the clear version conflicts PR is still open/unmerged.
Also, the text of this documentation will probably be tweaked in the near future.
What is the current behavior?
There is no documentation on how to handle version conflicts in the TA/Instructor grading interface.
What is the new behavior?
There is now a new page in the TA or Grader section for documentation about how to resolve version conflicts through using the "Clear Version Conflicts" button or clearing version conflicts manually.
Other information?
Initial work for Issue #10254 (Submitty/Submitty#10254)
More revisions to come...