Non-fast-forward upstream sync -- needs review - #3
Open
V-rtualized wants to merge 13 commits into
Open
Conversation
Updated mods: - Pokermon: 7e12a80 → da2e38b (VersionSource.HEAD)
Updated mods: - Nacho's Pokermon Dip: 28a782b → 5949031 (VersionSource.HEAD)
Updated mods: - Bundles Of Fun: 16e4516 → 036c421 (VersionSource.HEAD)
Updated mods: - Bundles Of Fun: 036c421 → ae121cf (VersionSource.HEAD) - Pokermon: da2e38b → 3a9be1c (VersionSource.HEAD) - Nacho's Pokermon Dip: 5949031 → 33be3e7 (VersionSource.HEAD)
Updated mods: - Aikoyori's Shenanigans: 55be56c → 9e95983 (VersionSource.HEAD)
Updated mods: - Plantain: df89d68 → 69546a8 (VersionSource.HEAD) - Silk Touch: 1.2.5a → 1.2.5b (VersionSource.LATEST_TAG) - Nacho's Pokermon Dip: 33be3e7 → 38da499 (VersionSource.HEAD)
Updated mods: - ArtBox: f9cf05d → aff4c60 (VersionSource.HEAD)
Updated mods: - Aikoyori's Shenanigans: 9e95983 → aaa40eb (VersionSource.HEAD)
Updated mods: - TOGA's Stuff: 1.15.2b → 1.15.2c (VersionSource.LATEST_TAG) - Nacho's Pokermon Dip: 38da499 → d4cfa00 (VersionSource.HEAD) - The Toxic Stall: A Pokermon addon: 6baa080 → ed2f126 (VersionSource.HEAD)
Updated mods: - Nacho's Pokermon Dip: d4cfa00 → d5a478d (VersionSource.HEAD) - Agarmons: A Pokermon Addon: 17bc835 → 3708451 (VersionSource.HEAD) - Balatro Story Mode: 8ab0cd3 → e509dd0 (VersionSource.HEAD)
Updated mods: - Plantain: 69546a8 → c3e6856 (VersionSource.HEAD) - Balatro Story Mode: e509dd0 → 306f61c (VersionSource.HEAD)
Updated mods: - TOGA's Stuff: 1.15.2c → 1.15.2c1 (VersionSource.LATEST_TAG) - Bundles Of Fun: ae121cf → 023b35c (VersionSource.HEAD) - Sholium: 2.8.0 → 2.8.1mc (VersionSource.LATEST_TAG)
Contributor
|
Validation found error(s):
Validation warning(s):
|
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.
The scheduled upstream sync could not fast-forward cleanly (expected going forward -- see BET-FORK.md/AGENTS.md discussion). This is the auto-generated -X ours merge from the 2026-08-06 06:47 run; supersedes the now-deleted 2026-08-05 branch. Review the diff before merging -- do not merge blindly.