From bd62270f557c58adeaa17089a862dcda3ff4ef26 Mon Sep 17 00:00:00 2001
From: Nicolas Arnaud-Cormos <nicolas.arnaudcormos@gmail.com>
Date: Wed, 25 Mar 2026 06:59:54 +0100
Subject: [PATCH] chore(main): release 0.16.1

---
 .release-please-manifest.json |  2 +-
 CHANGELOG.md                  | 24 ++++++++++++++++++++++++
 Cargo.lock                    |  2 +-
 Cargo.toml                    |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index bc7e4aa..256c881 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.16.0"
+  ".": "0.16.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8673596..e09d733 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.16.1](https://github.com/narnaud/git-loom/compare/v0.16.0...v0.16.1) (2026-03-25)
+
+
+### Bug Fixes 🐞
+
+* **merge:** handle conflicts in loom branch merge with continue/abort support ([1cc14b6](https://github.com/narnaud/git-loom/commit/1cc14b6c72317e24f0e6826e9e91bd8787bc7ef3))
+* prevent data loss in split, commit, reword, and fold commands ([a4ce587](https://github.com/narnaud/git-loom/commit/a4ce587ebeee91e30e0c166ac699fae113de37be))
+* **push:** fix Azure DevOps PR creation on Windows ([c9fb030](https://github.com/narnaud/git-loom/commit/c9fb030c13af5ba13ca6913109937c4b81b0c0d2))
+* **shortid:** only avoid exact ID collisions, not shared first letters ([0b5d8d5](https://github.com/narnaud/git-loom/commit/0b5d8d5a32bb8d831bc32842702c57c75b47feae))
+* **trace:** append abort/continue to the originating command trace ([22561a4](https://github.com/narnaud/git-loom/commit/22561a4cf4ee3367ed5bae465d3842338aef5203))
+* **update:** handle inverted merge parent ordering in weave topology ([cce12a9](https://github.com/narnaud/git-loom/commit/cce12a97cdaff97d0be3a1e55d338003ec3d9b3d))
+* **update:** use consistent diff engine for patch-ID matching ([e98d4f2](https://github.com/narnaud/git-loom/commit/e98d4f22443fe7f454342bed6f3e32549ed78902))
+* **update:** use weave-based rebase to prevent upstream commits leaking into feature branches ([7069d5c](https://github.com/narnaud/git-loom/commit/7069d5cf3d34d1656aa30011bd9e0f5ed83459ce))
+
+
+### Performance Improvements ⚡
+
+* **update:** replace patch-ID pipeline with git cherry for cherry-pick detection ([daa6eae](https://github.com/narnaud/git-loom/commit/daa6eaeb55faaf521d81aab7512583ace00b5a01))
+
+
+### Changes
+
+* replace raw git calls with run_git_stdout ([c626733](https://github.com/narnaud/git-loom/commit/c626733ef8dcb839e1e17f70a6dde9a5193a0d17))
+
 ## [0.16.0](https://github.com/narnaud/git-loom/compare/v0.15.1...v0.16.0) (2026-03-21)
 
 
diff --git a/Cargo.lock b/Cargo.lock
index 326c09f..ce8f0f3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -340,7 +340,7 @@ dependencies = [
 
 [[package]]
 name = "git-loom"
-version = "0.16.0"
+version = "0.16.1"
 dependencies = [
  "anyhow",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index 64527bb..4f57f35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "git-loom"
-version = "0.16.0"
+version = "0.16.1"
 edition = "2024"
 rust-version = "1.90"
 description = "A Git CLI tool that weaves together multiple feature branches into integration branches"