fix: correct Cargo.toml after merge conflict resolution#26
Merged
Conversation
The release-merge conflict resolver kept the entire release Cargo.toml instead of only the version field. This restores the new features (http, database, cache, moka dep, reqwest pin) from main while keeping the release version number.
|
🎉 This PR is included in version 1.19.6 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
catinspace-au
added a commit
that referenced
this pull request
May 21, 2026
fix: correct Cargo.toml after merge conflict resolution
catinspace-au
added a commit
that referenced
this pull request
May 21, 2026
fix: correct Cargo.toml after merge conflict resolution
catinspace-au
added a commit
that referenced
this pull request
May 21, 2026
fix: correct Cargo.toml after merge conflict resolution
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.
Summary
The release-merge conflict resolver kept the entire release Cargo.toml instead of only the version field. This restores:
httpfeature with reqwest pinned to 0.12databasefeature with serde_jsoncachefeature with moka dependencyenvfeature flagThe source files (http_client/, database/, cache/) are already on release from previous merges — only Cargo.toml was wrong.
Root Cause
hyperi-ci release-mergeresolves Cargo.toml conflicts by keeping release's entire file, not just the version line. This needs fixing in hyperi-ci.