From 1bbf3a264cddb92ff24e5623a8a8aa0e32c90dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 20 Feb 2023 22:27:18 +0100 Subject: [PATCH] backend: specify --rebase when using git pull MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise it fails with: ``` Pulling without specifying how to reconcile divergent branches is discouraged. ``` Signed-off-by: Jakub SokoĊ‚owski --- .../src/spiffworkflow_backend/services/git_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/git_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/git_service.py index e6d924264..0638cca9d 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/git_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/git_service.py @@ -225,7 +225,7 @@ class GitService: with FileSystemService.cd( current_app.config["SPIFFWORKFLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR"] ): - cls.run_shell_command(["git", "pull"]) + cls.run_shell_command(["git", "pull", "--rebase"]) return True @classmethod