Conflict resolution

[jitsedesmet]

This PR closes #456.

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

Coverage report for frontend

St.:grey_question:	Category	Percentage	Covered / Total
🟡	Statements	79.33%	2080/2622
🟡	Branches	67.34%	400/594
🟡	Functions	75.5%	305/404
🟡	Lines	79.95%	1794/2244

Show new covered files 🐣

|

St.^{:grey_question:}

| File | Statements | Branches | Functions | Lines | | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------- | :--------- | :------- | :-------- | :----- | | 🟢 |

`...` / conflictResolutionList.tsx

| 88.89% | 66.67% | 100% | 87.5% | | 🟢 |

`...` / conflictResolutionItem.tsx

| 83.05% | 66.67% | 90.91% | 83.33% | | 🟢 |

`...` / conflictResolutionRadioButton.tsx

| 87.18% | 64.29% | 75% | 84.85% | | 🟢 |

`...` / projectSkillRegister.tsx

| 94.74% | 85.71% | 100% | 94.12% |

Show files with reduced coverage 🔻

|

St.^{:grey_question:}

| File | Statements | Branches | Functions | Lines | | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------- | :---------------------------------------------------------- | :---------------------------------------------------------- | :------------------------------------------------------------- | | 🔴 |

`...` / StudentEntity.ts

| 50.88% | 100% |

75% (-8.33% 🔻)

|

50.91% (+1.85% 🔼)

| | 🟢 |

`...` / assignmentItem.tsx

|

96.15% (+2.15% 🔼)

|

80% (-1.82% 🔻)

| 100% |

95.65% (+2.63% 🔼)

| | 🟢 |

`...` / AssignmentCalls.ts

|

89.29% (-10.71% 🔻)

|

50% (-50% 🔻)

| 100% |

92.31% (-7.69% 🔻)

| | 🟢 |

`...` / assignmentStudentRow.tsx

|

92.86% (-1.26% 🔻)

| 70% | 100% |

90.91% (-2.42% 🔻)

| | 🔴 |

`...` / dataInjectionHandler.ts

| 9.42% | 0% | 0% | 11.89% |

Test suite run success

140 tests passing in 47 suites.

Report generated by 🧪jest coverage report action from cac7f75d57a765cdc6c314183a69369c0b3d0fc1

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[jitsedesmet]

This PR now also contains tests! Yey (thanks to my sleep disorder)

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple:

[github-actions[bot]]

There is no coverage information present for the Files changed

Total Project Coverage	100%	:green_apple: