From 51990c91b1cac2731788fc68cb46dea7d1332d86 Mon Sep 17 00:00:00 2001
From: Bas Zalmstra <4995967+baszalmstra@users.noreply.github.com>
Date: Fri, 5 Jun 2026 17:32:22 +0200
Subject: [PATCH] chore: release v0.11.0

---
 CHANGELOG.md | 11 +++++++++++
 Cargo.lock   |  2 +-
 Cargo.toml   |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ae956cb..6175432b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.0](https://github.com/prefix-dev/resolvo/compare/resolvo-v0.10.4...resolvo-v0.11.0) - 2026-06-05
+
+### Fixed
+
+- don't merge conflict nodes with distinct requirements ([#233](https://github.com/prefix-dev/resolvo/pull/233))
+
+### Other
+
+- Fix panic in add_pending_forbid_clauses during conflict detection ([#231](https://github.com/prefix-dev/resolvo/pull/231))
+- [**breaking**] add explicit layout of externally provided ids ([#224](https://github.com/prefix-dev/resolvo/pull/224))
+
 ## [0.10.4](https://github.com/prefix-dev/resolvo/compare/resolvo-v0.10.3...resolvo-v0.10.4) - 2026-06-02
 
 ### Other
diff --git a/Cargo.lock b/Cargo.lock
index ab8b4cde..f10fef8a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1097,7 +1097,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "resolvo"
-version = "0.10.4"
+version = "0.11.0"
 dependencies = [
  "ahash",
  "async-std",
diff --git a/Cargo.toml b/Cargo.toml
index 1c54946f..034efdc2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,7 +3,7 @@ members = ["cpp", "tools/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.10.4"
+version = "0.11.0"
 authors = [
     "Adolfo Ochagavía <github@adolfo.ochagavia.nl>",
     "Bas Zalmstra <zalmstra.bas@gmail.com>",