instruction description for conflict merge request of version 12.3.1 is misguided

generate one merge request, and the merge request can not be merged automatically due to the conflict
click the hint command line

operate according to the hints by the following dialog
for step 3 (git checkout "origin/master"), the problem happens. because the origin/master is not a local branch, it is in detached state

for the gitlab previous version, e.g. 10.8.4, the hint dialog is different, as follows

the command for step 3 is git checkout master

solve this problem, just as the previous working edition

Edited Oct 28, 2019 by HellenHuai