Can you resolve a merge conflict on GitHub without using the command line?
Yes for simple text conflicts. The pull request page has a Resolve conflicts button that opens an editor with markers; fix them, mark resolved and commit. Complex cases like deleted or binary files need a local merge.
Explain it simply
Handy when you are on a mobile browser with no laptop: GitHub offers a web editor for conflicts.
On the pull request, click Resolve conflicts. GitHub shows each file with the familiar markers. Edit the text, click Mark as resolved, then Commit merge. That adds a merge commit to the PR branch. The button is unavailable when the conflict involves binary files, renamed and deleted files together, or the changes are too large. For those, merge the base branch locally, fix, and push.
Example
Pull request page
This branch has conflicts that must be resolved
[Resolve conflicts] -> edit -> [Mark as resolved] -> [Commit merge]What to say in the interview
"GitHub's web editor can resolve simple text conflicts: Resolve conflicts, edit the markers, mark resolved and commit the merge. For binary files or complex rename and delete conflicts I merge the base branch locally."