Digger: refuse to plan or apply a branch that is behind main #3

Open

levior-bot wants to merge 1 commit from digger-require-up-to-date into main

pull from: digger-require-up-to-date

merge into: levior:main

levior:main

levior:simlau/buildkit-in-cluster

levior:renovate/https-code.forgejo.org-forgejo-download-artifact-7.x

levior:simlau/oci-labels

levior:registry-push-in-cluster

levior:simlau/trivyignore

levior:simlau/scan-push

levior:simlau/build-scan

levior:simlau/trivy-0.75

levior:scan-run-trivy

levior:trivy-tag-ref

levior:simlau/digger-apply-lock

levior:simlau/digger-outdated-guard

levior:simlau/digger-forgejo-token

Conversation 0 Commits 1 Files changed 1 +7

levior-bot commented 2026-10-23 06:28:08 +00:00

Member

Copy link

An apply from an outdated branch destroys whatever main gained in the meantime, as happened with levior/infra #63.

Opened by nhh@softwarehuset.com with levior pr create.

An apply from an outdated branch destroys whatever main gained in the meantime, as happened with levior/infra #63. Opened by nhh@softwarehuset.com with `levior pr create`.

levior-bot added 1 commit 2026-10-23 06:28:08 +00:00

Digger: refuse to plan or apply a branch that is behind main 40987a9ee8

This pull request has changes conflicting with the target branch.

• .forgejo/workflows/digger.yml

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'Digger: refuse to plan or apply a branch that is behind main' (#3) from digger-require-up-to-date into main

Merge commit body Reviewed-on: https://code.levior.io/levior/pipeline-templates/pulls/3

Merge pull request 'Digger: refuse to plan or apply a branch that is behind main' (#3) from digger-require-up-to-date into main Reviewed-on: https://code.levior.io/levior/pipeline-templates/pulls/3 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin digger-require-up-to-date:digger-require-up-to-date

git switch digger-require-up-to-date

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

levior/pipeline-templates!3

No description provided.