Commit 7f385abb authored by David O'Regan's avatar David O'Regan

Merge branch '291078-fix-typo-merge-locally' into 'master'

Fix typo on merge locally step

See merge request gitlab-org/gitlab!49330
parents c0606b2b eb181129
...@@ -82,7 +82,7 @@ export default { ...@@ -82,7 +82,7 @@ export default {
mergeInfo2() { mergeInfo2() {
return this.isFork return this.isFork
? `git fetch origin\ngit checkout "${this.targetBranch}"\ngit merge --no-ff "${this.sourceProjectPath}-${this.sourceBranch}"` ? `git fetch origin\ngit checkout "${this.targetBranch}"\ngit merge --no-ff "${this.sourceProjectPath}-${this.sourceBranch}"`
: `git fetch origin\ngit checkout "${this.targetBranch}"\ngit merge --no-ff " ${this.sourceBranch}"`; : `git fetch origin\ngit checkout "${this.targetBranch}"\ngit merge --no-ff "${this.sourceBranch}"`;
}, },
mergeInfo3() { mergeInfo3() {
return this.canMerge return this.canMerge
......
---
title: Fix typo on merge locally step
merge_request: 49330
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment