Update resolving-a-merge-conflict-on-github.md#16277

exp-horibe wants to merge 1 commit intogithub:maingithub/docs:mainfrom

exp-horibe:patch-2exp-horibe/docs:patch-2Copy head branch name to clipboard