Conversation
Both merged to main during the v0.69.0 release PR's CI window, so they ship in 0.69.0 but weren't covered by the changelog: - #3549 fixes a data-corruption bug where `wt merge` / `wt step squash` / `wt step rebase` measured the span against a stale local target ref and folded already-upstream commits into the local default branch (fixes #3519, thanks @starlightromero for reporting). - #3539 makes a signal-killed rebase exit as a clean interrupt (130/143) instead of a spurious merge conflict. #3320 also landed in the window but only touches the running-tend skill (not shipped to users), so it gets no changelog entry. > _This was written by Claude Code on behalf of max_
worktrunk-bot
approved these changes
Jul 24, 2026
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.
docs(changelog): fold #3549 and #3539 into the 0.69.0 changelog
Both merged to main during the v0.69.0 release PR's CI window, so they
ship in 0.69.0 but weren't covered by the changelog:
wt merge/wt step squash/wt step rebasemeasured the span against a stale local target ref andfolded already-upstream commits into the local default branch
(fixes wt merge trusts stale local default-branch ref, can squash unrelated already-upstream commits into it #3519, thanks @starlightromero for reporting).
instead of a spurious merge conflict.
#3320 also landed in the window but only touches the running-tend skill
(not shipped to users), so it gets no changelog entry.