backend: specify --rebase when using git pull
Otherwise it fails with: ``` Pulling without specifying how to reconcile divergent branches is discouraged. ``` Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
parent
1e8e6a7968
commit
1bbf3a264c
|
@ -225,7 +225,7 @@ class GitService:
|
||||||
with FileSystemService.cd(
|
with FileSystemService.cd(
|
||||||
current_app.config["SPIFFWORKFLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR"]
|
current_app.config["SPIFFWORKFLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR"]
|
||||||
):
|
):
|
||||||
cls.run_shell_command(["git", "pull"])
|
cls.run_shell_command(["git", "pull", "--rebase"])
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
Loading…
Reference in New Issue