From 3cdfbc28c17f1106a73647458bb6dd4fb548cd8a Mon Sep 17 00:00:00 2001
From: Yuriy Andamasov <yuriy@vyos.io>
Date: Tue, 12 May 2026 09:33:26 +0300
Subject: T8782: adopt central Mergify baseline via `extends: mergify`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds .github/mergify.yml that inherits from vyos/mergify:.mergify.yml.
The central baseline provides:
  - defaults.actions.backport.ignore_conflicts: false (new in T8782 —
    makes backport conflicts fail loudly instead of committing literal
    `<<<<<<< / ======= / >>>>>>>` markers; see incident below)
  - pull_request_rules → label conflicting PRs with `conflicts`
  - commands_restrictions → restrict @Mergifyio slash commands to
    @vyos/maintainers + vyosbot

Why this repo, why now: 2026-05-12, PR #1994 was backported via
`@Mergifyio backport sagitta circinus`. Cherry-pick conflicted in
docs/conf.py; Mergify's pre-T8782 default (`ignore_conflicts: true`)
committed the markers, the resulting PRs (#1998 / #1999) were merged
anyway, and Read the Docs builds on both branches broke with
`SyntaxError: invalid syntax (conf.py, line 309)`. Fix-forwards
#2000 (circinus) and #2001 (sagitta) restored both branches. Adopting
the central baseline closes the gap for this repo so the same failure
mode cannot recur via the Mergify-managed backport path.

Spec: https://vyos.atlassian.net/wiki/spaces/VYOS/pages/849477640
IS-432: https://vyos.atlassian.net/browse/IS-432

🤖 Generated by [robots](https://vyos.io)
---
 .github/mergify.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..21c9921c
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,19 @@
+# yaml-language-server: $schema=https://docs.mergify.com/configuration/file-format/
+# Mergify configuration for vyos/vyos-documentation.
+#
+# Inherits the central baseline from vyos/mergify:.mergify.yml. The central
+# baseline provides:
+#   - `defaults.actions.backport.ignore_conflicts: false`
+#   - `pull_request_rules` → label conflicting PRs with `conflicts`
+#   - `commands_restrictions` → restrict @Mergifyio slash commands to
+#     @vyos/maintainers + vyosbot
+#
+# Rollout context: T8782 (Mergify central-config rollout). See
+# https://vyos.dev/T8782 and the Confluence spec at
+# https://vyos.atlassian.net/wiki/spaces/VYOS/pages/849477640.
+#
+# Local overrides for this repo go below the `extends:` line — any keys
+# defined here merge with (or, for same-name rules, replace) the inherited
+# configuration per Mergify's `extends:` semantics.
+
+extends: mergify
-- 
cgit v1.2.3