From 8288460ae513dc125e807f6bef18551a4e70718f Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 25 Feb 2019 07:27:01 +0100
Subject: [PATCH] fix: never commit on top of existing branch
Closes #3123
---
lib/workers/branch/commit.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/workers/branch/commit.js b/lib/workers/branch/commit.js
index 3737c1f658..f6ca6f0547 100644
--- a/lib/workers/branch/commit.js
+++ b/lib/workers/branch/commit.js
@@ -20,7 +20,7 @@ async function commitFilesToBranch(config) {
config.branchName,
updatedFiles,
config.commitMessage,
- config.parentBranch || config.baseBranch || undefined
+ config.baseBranch || undefined
);
if (res) {
logger.info({ branch: config.branchName }, `Branch ${res}`);
--
GitLab