Repository navigation
Remove the conflict markers #4415 left in the v6.7 changelog - #4416
Merged
Merged
Conversation
|
The latest Buf updates on your PR. Results from workflow Buf / buf (pull_request).
|
![seidroid[bot]](https://avatars.githubusercontent.com/in/2745135?s=60&v=4){kind=small}
There was a problem hiding this comment.
This PR changes only the changelog. It removes the three conflict-marker lines and the duplicate #4347 entry from the v6.7 section, and the remaining #4347 entry is still present. I found no issues.
Findings: 0 blocking | 0 non-blocking | 0 posted inline
Blockers
- None at the file/PR level.
Non-blocking
- None at the file/PR level.
masih
approved these changes
Oct 1, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release/v6.7 #4416 +/- ##
================================================
- Coverage 61.48% 60.45% -1.03%
================================================
Files 2168 2069 -99
Lines 189616 177872 -11744
================================================
- Hits 116587 107540 -9047
+ Misses 62249 60499 -1750
+ Partials 10780 9833 -947
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
1 task done
masih
pushed a commit
that referenced
this pull request
Oct 1, 2026
## Summary - Bump `version.json` from `v6.7.0-rc3` to `v6.7.0-rc4` to cut the fourth `v6.7` release candidate. Contents since rc3: #4411, #4410, #4409, #4397, #4378, #4377, #4371, plus the rc4 changelog update (#4415, with the conflict-marker fix #4416). The changelog has already landed, so the `v6.7.0-rc4` tag will include it. - All seven are labeled `non-app-hash-breaking`. #4371 changes the AppHash only for nodes pinned to a `migrate_*` write mode while the migration hasn't started (see #4369), and the hard-fork handlers added by #4409 and #4410 are not registered for any chain in this release. Unlike rc3, moving from rc3 to rc4 should not need a coordinated validator switch. - Push `v6.7.0-rc4` by hand on this PR's merge commit once it has merged; the tagging ruleset stops `uci-release-publish` from creating it. The rc3 tag was pushed before #4339 merged and sits on `0d56aaeef`, where `version.json` still reads `v6.7.0-rc2`. - #4378 raises GoReleaser's timeout to 2h. The rc3 tag push hit the 1h limit during the emulated arm64 build and attached nothing, so rc4 is the first `v6.7` release candidate that should get binaries. ## Test plan - [x] `git diff --check` Made with [Cursor](https://cursor.com) Co-authored-by: Cursor <cursoragent@cursor.com>
revofusion
pushed a commit
to revofusion/sei-chain
that referenced
this pull request
Oct 5, 2026
Adds the `release/v6.7` entries merged since the rc4 changelog (sei-protocol#4406), in prep to cut **v6.7.0**, the mainnet release (there is no rc5; the version bump is sei-protocol#4444): - [sei-protocol#4442](sei-protocol#4442) — fix(seidb): fix stale FlatKV migration gauges on snapshotting nodes - [sei-protocol#4439](sei-protocol#4439) — seidb: add changelog mode and --inspect-plan to speed up EVM digest - [sei-protocol#4416](sei-protocol#4416) — removal of the conflict markers the rc4 changelog backport left on `release/v6.7` - [sei-protocol#4415](sei-protocol#4415) — rc4 changelog backport - [sei-protocol#4407](sei-protocol#4407) — rc4 version bump Regenerated with `./scripts/generate-changelog.sh release/v6.6 release/v6.7`; only the `## v6.7` PR list changes, so the `backport release/v6.7` cherry-pick applies cleanly (simulated with `git merge-tree` against `origin/release/v6.7`). Docs-only; no code change. Made with [Cursor](https://cursor.com) 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
2 participants
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.
#4415, seidroid's backport of #4406, was merged with its
BACKPORT-CONFLICTplaceholder commit, which committed the unresolved cherry-pick intoCHANGELOG.mdonrelease/v6.7: three conflict-marker lines, plus a duplicate #4347 line from therelease/v6.7side.This removes those four lines and keeps #4406's side, which already lists #4347. Afterwards:
## v6.7matches./scripts/generate-changelog.sh release/v6.6 release/v6.7again. The Backportrelease/v6.7: Update v6.7 changelog in prep to cut rc4 #4415 line itself is left for the next changelog update, as with earlier changelog backports.## v6.7section is identical onrelease/v6.7andmain, so the next changelog backport applies cleanly.Docs-only; no code change. Should merge before the rc4 version bump (#4407), so v6.7.0-rc4 ships a clean changelog.
Made with Cursor