diff --git a/scripts/endorse.sh b/scripts/endorse.sh index 163cce1b..9088a8d5 100755 --- a/scripts/endorse.sh +++ b/scripts/endorse.sh @@ -46,7 +46,9 @@ EOF echo "$ENDORSER_ID" >> "$endorsersAskedFile" git add "$endorsersAskedFile" git commit -m "Update list of endorsers asked" -git push +while ! git push; do + git pull --rebase +done gh api \ --method POST \ diff --git a/scripts/update-voter-team.sh b/scripts/update-voter-team.sh index e423de40..aa90c736 100755 --- a/scripts/update-voter-team.sh +++ b/scripts/update-voter-team.sh @@ -116,5 +116,7 @@ done | sort > "$invitedFile" git add scripts/invited.txt if ! git diff --cached --exit-code; then git commit -m "Update list of invited users" - git push + while ! git push; do + git pull --rebase + done fi