Fix a warning when running release command

[MAILPOET-3262]
2021-01-04 13:18:08 +01:00
parent fbaabd8a6e
commit 60f175bcca
1 changed files with 1 additions and 1 deletions
--- 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()