summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/update-version-tags.yml6
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: