Skip to content

Conversation

MantisClone
Copy link
Member

@MantisClone MantisClone commented May 16, 2025

@coderabbitai ignore

Problem

After GITBOOK-132: chore: sync FAQ changes from CR130 to Github, the Gitbook sync configuration was accidentally set to the master branch instead of the main branch.

Screenshot 2025-05-16 at 1 03 24 PM

As a result:

  • main branch is still the default branch in Github but it's missing the latest changes (GITBOOK-133 through GITBOOK-140).
  • master branch commit history is fully distinct from main and cannot be merged via the Github UI.
  • Changes to the main branch 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

  • Rebase master on top of main so that the git history is approximately correct.
  • Push a new branch rebase-master-on-top-of-main
  • Create pull request to merge rebase-master-on-top-of-main into main
  • Allow Gitbook to bypass Github main branch protection rule
  • Merge the pull request to main
  • Fix Gitbook sync configuration to use main instead of master and initiate a resync.
  • Delete master branch

This comment was marked as resolved.

@MantisClone MantisClone changed the title chore: Rebase master on to of main chore: rebase master on top of main May 16, 2025
@MantisClone MantisClone changed the title chore: rebase master on top of main chore: rebase master on top of main May 16, 2025
@MantisClone MantisClone changed the title chore: rebase master on top of main chore: rebase master onto main May 16, 2025
@MantisClone MantisClone self-assigned this May 16, 2025
@MantisClone MantisClone marked this pull request as ready for review May 16, 2025 17:11
coderabbitai[bot]

This comment was marked as resolved.

@MantisClone MantisClone moved this from 🆕 New to 🔖 Sprint Backlog in Request Network Tech Backlog May 16, 2025
@MantisClone MantisClone moved this from 🔖 Sprint Backlog to 👀 In Review in Request Network Tech Backlog May 16, 2025
@MantisClone
Copy link
Member Author

I allowed Gitbook to bypass main branch protection rule. ✅
Screenshot 2025-05-16 at 1 35 32 PM
Screenshot 2025-05-16 at 1 36 28 PM

@MantisClone MantisClone changed the title chore: rebase master onto main chore: rebase master onto main, merge master into main, delete master May 16, 2025
Copy link
Contributor

@bassgeta bassgeta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes seem sensible, time to get rid of master!
Nice pickup 😎

@MantisClone MantisClone merged commit 439a89b into main May 20, 2025
9 checks passed
@MantisClone MantisClone deleted the rebase-master-on-to-of-main branch May 20, 2025 20:07
@github-project-automation github-project-automation bot moved this from 👀 In Review to ✅ Done in Request Network Tech Backlog May 20, 2025
@MantisClone
Copy link
Member Author

@MantisClone
Copy link
Member Author

MantisClone commented May 21, 2025

All action items have been completed and the problem is resolved. ✅

@MantisClone MantisClone restored the rebase-master-on-to-of-main branch May 21, 2025 03:10
@MantisClone MantisClone deleted the rebase-master-on-to-of-main branch May 21, 2025 03:29
@MantisClone MantisClone restored the rebase-master-on-to-of-main branch May 21, 2025 03:34
@MantisClone MantisClone deleted the rebase-master-on-to-of-main branch May 21, 2025 03:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

3 participants