diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-26 23:30:53 +0300 |
|---|---|---|
| committer | Yuriy Andamasov <yuriy@vyos.io> | 2026-05-26 23:30:53 +0300 |
| commit | 8509bb8ea322c5323bf0b9f71fccd8f9788f93ab (patch) | |
| tree | b98f93a04a1549547d432d4d5c3e81a89b683a57 | |
| parent | f775eb5fa5546d00eb3411e5988667fef38f9088 (diff) | |
| download | mirror-canary-8509bb8ea322c5323bf0b9f71fccd8f9788f93ab.tar.gz mirror-canary-8509bb8ea322c5323bf0b9f71fccd8f9788f93ab.zip | |
test: B.7 — conflict + branch-protection enforces merge block on sagitta
| -rw-r--r-- | tests/b3-conflict-target.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/b3-conflict-target.txt b/tests/b3-conflict-target.txt index a12bfae..1af145a 100644 --- a/tests/b3-conflict-target.txt +++ b/tests/b3-conflict-target.txt @@ -1 +1 @@ -rolling-version content — DIFFERENT from sagitta — backport will conflict +B.7 rolling-version content — DIFFERENT from sagitta's b3-conflict-target — backport will conflict, AND ruleset blocks merge |