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
94e1e15c31
commit
0065b98b57
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue