Repository navigation
docs: fix fork synchronization instructions - #338
Open
sparrowren wants to merge 1 commit into
Open
sparrowren wants to merge 1 commit into
sparrowren wants to merge 1 commit into
Conversation
|
🚀 IvorySQL-Docs Preview Ready
|
sparrowren
marked this pull request as ready for review
October 15, 2026 02:28
This branch was successfully 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
1 participant
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.
Both contribution READMEs tell contributors to merge
upstream/main, but this repository has nomainbranch. A fresh clone of a contributor's fork also does not have anupstreamremote configured.Update the English and Chinese instructions to explain the one-time upstream setup and explicitly synchronize the local
v5.6branch withupstream/v5.6, using a fast-forward merge and a push toorigin. Explain how to use another target branch and handle divergent histories.Validation:
--ff-onlyrejects divergent histories and preserves the local commit.git diff --checkpassed.The validation ran with Git for Windows. All pushes during validation targeted local fixture repositories.