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.

Sign up for GitHub

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

Jump to bottom

Merge Conflict while reviewing exam complaints (Tutor) #9859

Open
StellaHalf opened this issue Nov 25, 2024 · 2 comments
Open

Merge Conflict while reviewing exam complaints (Tutor) #9859

StellaHalf opened this issue Nov 25, 2024 · 2 comments
Labels
assessment Pull requests that affect the corresponding module bug exam Pull requests that affect the corresponding module exercise Pull requests that affect the corresponding module lecture Pull requests that affect the corresponding module programming Pull requests that affect the corresponding module

Comments

@StellaHalf
Copy link

Describe the bug

Artemis shows a merge conflict while reviewing exam complaints (Tutor view), this should not be the case.

To Reproduce

Go to 'https://artemis.ase.in.tum.de/course-management/404/exams/793/exercise-groups/3262/programming-exercises/15024/submissions/9372507/assessment?correction-round=0'
See Error

Expected behavior

no merge conflict

Screenshots

artemisissue

Which version of Artemis are you seeing the problem on?

7.7.1

What browsers are you seeing the problem on?

Firefox

Additional context

No response

Relevant log output

No response
@StellaHalf StellaHalf added the bug label Nov 25, 2024
@github-actions github-actions bot added assessment Pull requests that affect the corresponding module exam Pull requests that affect the corresponding module exercise Pull requests that affect the corresponding module lecture Pull requests that affect the corresponding module programming Pull requests that affect the corresponding module labels Nov 25, 2024
@krusche
Copy link
Member

krusche commented Nov 25, 2024

This should not happen, but I also cannot really explain how it happened. You can safely resolve the conflict in the user interface

@krusche
Copy link
Member

krusche commented Nov 25, 2024 •
edited
Loading

We should probably rename the text in the popup. The button resets the working copy to the latest commit of the remote origin of the repository, it does not reset the remote repository!

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
assessment Pull requests that affect the corresponding module bug exam Pull requests that affect the corresponding module exercise Pull requests that affect the corresponding module lecture Pull requests that affect the corresponding module programming Pull requests that affect the corresponding module
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@krusche @StellaHalf