I did Create a Situation Where a merge conflict happened using Github.com then I resolved it.
Hi @mozzadrella, completed on without any merge conflicts. Also requested your review on the same.
I created a merge conflict using a different file
I resolved the conflict and completed the merge.
Note: i generated a dummy extra file, which i didn’t track, removed at the end.
Forced merge conflict with web editor, in the meantime someone edited the GroupAssignment.md -> so got real merge conflict