Skip to content

Fix merge option

Baodong请求将fix-merge-option合并到main-jh

Related issue: https://jihulab.com/gitlab-cn/gitlab/-/issues/2715

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 编辑于

合并请求报告