Fix merge option
https://jihulab.com/gitlab-cn/gitlab/-/issues/2715
Related issue:Fix merge option, from git merge "${MERGE_FROM} ${MERGE_OPTION}"
to git merge "origin/${MERGE_FROM}" "${MERGE_OPTION}"
.
to fix the error: merge: origin/master --ff - not something we can merge
由 Baodong 编辑于