From 364eb9f009773bec7922fd65bf28f0b9517e5fd3 Mon Sep 17 00:00:00 2001 From: Felix Ulonska <39523620+felix-ulonska@users.noreply.github.com> Date: Sat, 31 Oct 2020 23:21:51 +0100 Subject: [PATCH] Update batch_job.py fix(BatchMergeRequest): fixed a bug which prevented marge batch merging with fast forward commits --- marge/batch_job.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marge/batch_job.py b/marge/batch_job.py index 6b8e8268..e1b90cd3 100644 --- a/marge/batch_job.py +++ b/marge/batch_job.py @@ -262,7 +262,7 @@ def execute(self): local=True, ) # Update branch with MR changes - self._repo.fast_forward( + batch_mr_sha = self._repo.fast_forward( BatchMergeJob.BATCH_BRANCH_NAME, merge_request.source_branch, local=True,