Describe the bug

After a version control conflict occurs in a student submission, the assessment editor shows 'Unsubmitted' at the bottom of the file explorer. Sometimes, the editor also does not show the latest commit (more info below).

Possibly related: A tutor also had to manually resolve a conflict before he could start with the assessment. This should be done by Artemis automatically, I believe.

To Reproduce

1. Create a programming exercise with manual assessment, online editor enabled and the due date in such a way that points 2 - 5 can be performed comfortably before it passes
2. Participate in the programming exercise and in the online editor add the number '1' at the end of some line
3. Clone the student repo
4. In the online editor: Remove the 1 and instead add the number 2 at its place (don't submit!)
5. In your cloned repo, remove the 1 and add a 3 at its place. Add, commit and push.
6. Start assessing this submission.
7. In some cases, the line contains the '2', which is the only change that was never explicitly submitted. The correct number to show would be '3'.

The steps might have to be repeated multiple times for the error to occur. I haven't found a way to replicate the error reliably.

Expected behavior

• Instead of 'Unsubmitted', it should show 'Submitted'.
• The conflict resolution should be automatic and show the correct commit.

Screenshots

Which version of Artemis are you seeing the problem on?

7.7.5

What browsers are you seeing the problem on?

Chrome, Safari

Additional context

No response

Relevant log output

No response