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] Update version conflict documentation #623

Merged
merged 4 commits into from
Jul 29, 2024

Conversation

oliiso
Copy link
Contributor

@oliiso oliiso commented Jul 23, 2024

What is the current behavior?
Documentation for resolving a version conflict did not include recent updates.

What is the new behavior?
Documentation is now updated to recent commits and notes on how to remove version conflicts manually is removed due to it not being relevant.

Screenshots
Image 7-23-24 at 3 24 PM
Updated screenshot.

Closes #10254 (Submitty/Submitty#10254)

@bmcutler bmcutler merged commit 9d03ad4 into main Jul 29, 2024
3 checks passed
@bmcutler bmcutler deleted the resolving-version-conflict-update branch July 29, 2024 19:27
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.

3 participants