Repository navigation
Conversation
Port the fork-sync correction from IvorySQL#338 (which fixed README.md and README_zh.md on v5.6) to master's README_zh.md, which still carries the old block: it merges upstream/main -- a branch that does not exist in this repository -- and never explains how to add the upstream remote in the first place. Also fix the 'submit a PR' link, which points at a v5.0-era page that returns 404; point it at the master contribution guide that documents the current PR flow. Signed-off-by: zhang1939 <13942782872@163.com>
|
🚀 IvorySQL-Docs Preview Ready
|
This branch was previously deployed
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
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.
Summary
Two stale spots in master's README_zh.md:
git merge upstream/main, a branch that does not exist in this repository (the branches aremasterandv5.6), and it never explains how to add theupstreamremote in the first place. Ported the corrected instructions from docs: fix fork synchronization instructions #338 verbatim (branch-aware,--ff-only, explicit remote setup).CN/modules/ROOT/pages/master/contribution/contribution_guide.adoc), which documents the current PR flow.Validation