Explorar o código

PAPR: try to rebase on the latest code

Vadim Rutkovsky %!s(int64=7) %!d(string=hai) anos
pai
achega
38d101f96d
Modificáronse 1 ficheiros con 3 adicións e 0 borrados
  1. 3 0
      .papr.sh

+ 3 - 0
.papr.sh

@@ -18,6 +18,9 @@ else
 fi
 export target_branch
 
+# Rebase existing branch on the latest code locally, as PAPR running doesn't do merges
+git fetch origin ${target_branch} && git rebase origin/${target_branch}
+
 pip install -r requirements.txt
 
 PAPR_INVENTORY=${PAPR_INVENTORY:-.papr.inventory}