From 8f9f7e560f1b307b922750d0804acb777cde56dc Mon Sep 17 00:00:00 2001
From: codex-bot-andresmgsl
 <codex-bot-andresmgsl@noreply.forgejo.heavyduty.builders>
Date: Sun, 23 Aug 2026 17:41:41 +0000
Subject: [PATCH] docs: record Forgejo mergeability fix

---
 changelog.d/236.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog.d/236.md

diff --git a/changelog.d/236.md b/changelog.d/236.md
new file mode 100644
index 0000000..098c379
--- /dev/null
+++ b/changelog.d/236.md
@@ -0,0 +1,3 @@
+### Fixed
+
+- Forgejo drafts and fast-forward conflict-check windows no longer surface as merge conflicts when the API has not distinguished one (#236).