I was able to force a merge conflict and then resolve it! Yay…!
no merge conflict as I couldn’t join a team with other members Made my own branch for the pull request though.
@ccannon94 Here’s a screen shot with evidence of a forced merge conflict and PR from a branch named other. My reply here is quite delayed, thanks for your patience.
I need to have my students use the GitHub UI more than the command line, if at all.
So, I purposely created a conflict.
I then clicked the “Resolve Conflicts” button to get into this editor.
Then I edited out the conflict.
At which point the “Mark as resolved” button became active. I clicked that and got a green “Commit merge” button. Clicked that and got this page.
Then completed the “Merge pull request” and deleted the branch.
This whole exercise helped me immensely in figuring out merge conflicts.