Revert "Bug fixes for 2.4.0 in sqllin-dsl and sqllin-processor (#124)" - #125
Merged
Merged
Conversation
This reverts commit 96d05b5, the squash merge of #124. #124 fixes a set of independent issues, one commit each, and each commit message documents its own issue. Squashing folded them into a single commit and lost that per-issue history. This undoes the squash so that the same branch, feature/bug-fixes-2.4.0, can be merged again with a merge commit that keeps its individual commits. The re-merge brings back exactly the reverted content: the squashed commits were never part of this branch's history, so their merge base is still da96b10, where release/2.4.0 stood before the squash. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.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.
Reverts #124, which was squash-merged as 96d05b5.
#124 fixes a set of independent issues, one commit per issue, and each commit message documents its own issue. Squashing folded them into a single commit. Reverting the squash lets
feature/bug-fixes-2.4.0be merged again in a way that keeps its 18 commits.Re-merging after this lands
feature/bug-fixes-2.4.0intorelease/2.4.0(a merged PR can't be reopened) and merge it with Create a merge commit. Not squash, which would undo the point of this revert, and not rebase either: rebasing gives the 18 commits new hashes, while several commit messages and Bug fixes for 2.4.0 in sqllin-dsl and sqllin-processor #124's description refer to commits by hash.Verified locally
release/2.4.0is identical to da96b10, where it stood before the squash.git merge-tree. The merge base is still da96b10, because a squash merge doesn't put the squashed commits into the target branch's history. The merge has no conflicts, and its result is identical tofeature/bug-fixes-2.4.0(531f7f2).🤖 Generated with Claude Code