From 60f175bccade31df3ea658c778e254eb4ad3dc66 Mon Sep 17 00:00:00 2001 From: Pavel Dohnal Date: Mon, 4 Jan 2021 13:18:08 +0100 Subject: [PATCH] Fix a warning when running release command [MAILPOET-3262] --- RoboFile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RoboFile.php b/RoboFile.php index dd037d7255..805396dbf7 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -739,7 +739,7 @@ class RoboFile extends \Robo\Tasks { $this->taskGitStack() ->stopOnFail() ->checkout('master') - ->pull() + ->exec('git pull --ff-only') ->run(); // make sure release branch doesn't exist on github $releaseBranchStatus = $this->taskGitStack()