Skip to content

Fix merge conflicts of main to staging #7

Fix merge conflicts of main to staging

Fix merge conflicts of main to staging #7

Triggered via push October 9, 2023 17:34
Status Failure
Total duration 4m 10s
Artifacts

staging.yml

on: push
build-staging  /  build_frontend
3m 58s
build-staging / build_frontend
deploy-staging  /  Capistrano Deploy to Server
deploy-staging / Capistrano Deploy to Server
Fit to window
Zoom out
Zoom in

Annotations

2 errors
build-staging / build_frontend
Error: To https://github.com/dgidb/dgidb-v5 ! refs/heads/staging:refs/heads/staging [rejected] (non-fast-forward) Done Pushing to https://github.com/dgidb/dgidb-v5 error: failed to push some refs to 'https://github.com/dgidb/dgidb-v5' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
build-staging / build_frontend
Error: To https://github.com/dgidb/dgidb-v5 ! refs/heads/staging:refs/heads/staging [rejected] (non-fast-forward) Done Pushing to https://github.com/dgidb/dgidb-v5 error: failed to push some refs to 'https://github.com/dgidb/dgidb-v5' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.