The automated rebase of philips onto main failed due to conflicts.
Action required: A maintainer must resolve this manually.
git fetch origin
git checkout philips
git rebase origin/main
# Resolve conflicts file by file
git rebase --continue
git push origin philips --force-with-lease
Use /sync-upstream in Copilot chat for the full resolution procedure.
Triggered by: https://github.com/philips-forks/terraform-aws-github-runner/actions/runs/31358979262
The automated rebase of
philipsontomainfailed due to conflicts.Action required: A maintainer must resolve this manually.
git fetch origin git checkout philips git rebase origin/main # Resolve conflicts file by file git rebase --continue git push origin philips --force-with-leaseUse
/sync-upstreamin Copilot chat for the full resolution procedure.Triggered by: https://github.com/philips-forks/terraform-aws-github-runner/actions/runs/31358979262