Merge-Conflict on My Bloghttps://thaig2pro.github.io/en/tags/merge-conflict/Recent content in Merge-Conflict on My BlogHugo -- 0.146.0enWed, 23 Sep 2026 14:42:00 +0700A Merge Has Exactly Two Parents. The Line From a Third Branch Took Down Every API Route.https://thaig2pro.github.io/en/posts/merge-conflict-copy-nhanh-thu-ba/Wed, 23 Sep 2026 14:42:00 +0700https://thaig2pro.github.io/en/posts/merge-conflict-copy-nhanh-thu-ba/A conflict in the HTTP kernel was resolved by copying the whole file from a third branch. One middleware line came along, its class did not, and /api/* returned 500 for almost 18 hours.