diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-14 07:00:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-14 07:00:53 +0300 |
| commit | d0f89d74ba9f880e91c2595a3afc668a64cb9467 (patch) | |
| tree | bd6c16ae5324f7e64b14d2922439bba563ffb482 | |
| parent | bfce10e80addd69a070da99f2e85bd4e202c5505 (diff) | |
| parent | 1500697cabd0e41677f0a00b158067bf00295fab (diff) | |
| download | vyos-documentation-d0f89d74ba9f880e91c2595a3afc668a64cb9467.tar.gz vyos-documentation-d0f89d74ba9f880e91c2595a3afc668a64cb9467.zip | |
Merge pull request #2037 from vyos/yuriy/fix-update-version-tags-sagitta
ci(workflows): remove conflict markers from update-version-tags.yml (sagitta)
| -rw-r--r-- | .github/workflows/update-version-tags.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/.github/workflows/update-version-tags.yml b/.github/workflows/update-version-tags.yml index bb8325f2..cf03c57a 100644 --- a/.github/workflows/update-version-tags.yml +++ b/.github/workflows/update-version-tags.yml @@ -1,10 +1,5 @@ name: Update version tags -<<<<<<< HEAD -# This workflow exists on rolling, circinus, and sagitta. -# Keep all three copies in sync — backport edits via Mergify -# (`@Mergifyio backport circinus sagitta`) or cherry-pick. -======= # context7-refresh.yml triggers via workflow_run on this workflow's name. # DO NOT rename the `name:` field above without updating context7-refresh.yml. # @@ -16,7 +11,6 @@ name: Update version tags # semantically correct — the tag still represents the latest docs state. # `context7.json` is included because changes to its `rules`, `folders`, or # `excludeFolders` affect what Context7 returns even when no .md files moved. ->>>>>>> 800acbfd (ci(context7): gate version-tag move + refresh on docs-only changes) on: push: |