fixes #33 Read config from main branch instead of working directory#34
Merged
mattsgarlata merged 1 commit intomainfrom Feb 25, 2026
Merged
Conversation
Co-authored-by: Cursor <cursoragent@cursor.com>
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.
Closes #33
manual-merge.shreads.spider-merge-bot-config.jsonfrom the working directory, but the script checks out different branches during execution. After resolving a conflict (which leaves you on a release branch), re-running the script picks up that branch's stale config — potentially skipping branches in the merge chain.Adds a
config_json()helper that always reads the config viagit show origin/main:so the merge chain is correct regardless of which branch is checked out.Made with Cursor