[docs] Update documentation for features from 2025-11-18 #4252
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.
Documentation Updates - November 18, 2025
This PR updates the documentation based on user-facing features merged in the last 24 hours.
Features Documented
--mergeflag for 3-way mergeChanges Made
Updated
docs/src/content/docs/setup/cli.mdto document:--mergeflag to opt into 3-way merge mode (preserves local changes)Merged PRs Referenced
Documentation Quality
Notes
Other PRs from the last 24 hours:
All significant user-facing features from the last 24 hours are now documented.