Repository navigation
fix(savanna): remove stray conflict marker breaking release notes - #184
Merged
Tushar-TG-14 merged 3 commits intoOct 12, 2026
Merged
Conversation
A leftover '=======' conflict marker on line 6 was parsed by AsciiDoc as an unterminated example block, breaking release-notes page rendering. Also fix two malformed bold lead-ins (.** -> *...*) in the Oct 2026 bug-fix list.
✅ Deploy Preview for thriving-strudel-91d4a9 ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
ngarakapati
added a commit
to ngarakapati/cloud-docs
that referenced
this pull request
Oct 8, 2026
ngarakapati
force-pushed
the
fix/release-notes-conflict-marker
branch
from
October 8, 2026 06:02
690395f to
38fa8cc
Compare
Adds a combined screenshot of the new Billing page (wallet, plan, customer information, invoice history) under the 'New billing experience' entry. Named savanna-billing-page.png to avoid colliding with the existing cloud module billing-page.png.
ngarakapati
force-pushed
the
fix/release-notes-conflict-marker
branch
from
October 8, 2026 06:05
38fa8cc to
7012e05
Compare
ngarakapati
added a commit
to ngarakapati/cloud-docs
that referenced
this pull request
Oct 8, 2026
ngarakapati
changed the title
ngarakapati
changed the title
Contributor
Author
|
@duchoaile Could you please have a look this PR? So that we both could be on same page for the release notes update. |
duchoaile
approved these changes
Oct 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
A leftover
=======merge-conflict marker was committed intomodules/savanna/modules/overview/pages/release-notes.adoc(line 6) viac52216b. AsciiDoc parses 4+=as an example-block delimiter, so it opened an unterminated example block that swallowed the rest of the page — breaking release-notes rendering. The Antora build logsunterminated example blockfor this file.Before (broken)
The entire Changelog page is trapped inside one example block, so section headings render as literal
== Oct 2026/=== New billing experiencetext instead of real headings:Changes
=======conflict marker (line 6).Free tier Auto Suspend.**/GSQL Editor workspace switching.**→*Free tier Auto Suspend.*/*GSQL Editor workspace switching.*.savanna-billing-page.png).After (fixed)
Release notes parse cleanly, headings render, and the bold lead-ins display correctly:
Verification
git grepconfirms no conflict markers remain.npm run build:local) no longer emits theunterminated example blockwarning for this file, and the billing image resolves correctly.