diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index ca897f9..337bfbb 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -20,4 +20,6 @@ git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika- git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup git add . git commit -am"Github Mirror Push Back" -git push --force +git config pull.rebase true +git pull +git push