Skip to content
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

Merged
merged 10 commits into from
Jul 12, 2024

Conversation

oliiso
Copy link
Contributor

@oliiso oliiso commented Jul 3, 2024

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...

@oliiso oliiso changed the title [Documentation:TAGrading] Resolving Version Conflict Documentation [Documentation:TAGrading] Version Conflict Documentation Jul 3, 2024
_docs/grader/resolving_version_conflict.md Outdated Show resolved Hide resolved
_docs/grader/resolving_version_conflict.md Outdated Show resolved Hide resolved
Copy link
Contributor

@williamschen23 williamschen23 left a comment

Choose a reason for hiding this comment

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

Almost done!

_docs/grader/resolving_version_conflict.md Outdated Show resolved Hide resolved
oliiso and others added 3 commits July 9, 2024 15:41
Co-authored-by: Williams Chen <82904790+williamschen23@users.noreply.github.com>
@dorian451 dorian451 self-requested a review July 11, 2024 20:12
Copy link
Contributor

@dorian451 dorian451 left a 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?

@oliiso
Copy link
Contributor Author

oliiso commented Jul 11, 2024

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.

Copy link
Member

@bmcutler bmcutler left a 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.

@bmcutler bmcutler merged commit 7e00252 into main Jul 12, 2024
4 checks passed
@bmcutler bmcutler deleted the resolving_version_conflict branch July 12, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants