chore: rebase master onto main, merge master into main, delete master#102
Merged
MantisClone merged 9 commits intomainfrom May 20, 2025
Merged
chore: rebase master onto main, merge master into main, delete master#102MantisClone merged 9 commits intomainfrom
master onto main, merge master into main, delete master#102MantisClone merged 9 commits intomainfrom
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
master on top of main
master on top of mainmaster onto main
Member
Author
master onto mainmaster onto main, merge master into main, delete master
bassgeta
approved these changes
May 19, 2025
Contributor
bassgeta
left a comment
There was a problem hiding this comment.
Changes seem sensible, time to get rid of master!
Nice pickup 😎
Member
Author
Member
Author
|
All action items have been completed and the problem is resolved. ✅ |
Merged
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.



@coderabbitai ignore
Problem
After GITBOOK-132: chore: sync FAQ changes from CR130 to Github, the Gitbook sync configuration was accidentally set to the
masterbranch instead of themainbranch.As a result:
mainbranch is still the default branch in Github but it's missing the latest changes (GITBOOK-133 through GITBOOK-140).masterbranch commit history is fully distinct frommainand cannot be merged via the Github UI.mainbranch are not synced with Gitbook and therefore are not deployed to https://docs.request.network.This was discovered after merging #101, and the change was not deployed, contrary to expectations.
Solution
masteron top ofmainso that the git history is approximately correct.rebase-master-on-top-of-mainrebase-master-on-top-of-mainintomainmainbranch protection rulemainmaininstead ofmasterand initiate a resync.masterbranch