release: 0.28.1

Author: arxanas

CHANGELOG.md

@@ -8,20 +8,38 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Breaking changes
+
+### Deprecations
+
+### New features
+
+### Fixed bugs
+
+## [0.28.1] - 2025-04-04
+
 ### Security fixes
 
 * Fixed SHA-1 collision attacks not being detected.
   ([GHSA-794x-2rpg-rfgr](https://github.com/jj-vcs/jj/security/advisories/GHSA-794x-2rpg-rfgr))
 
-### Release highlights
+### Fixed bugs
 
-### Breaking changes
+* Resolved some potential build issues for packagers.
+  [#6232](https://github.com/jj-vcs/jj/pull/6232)
 
-### Deprecations
+* Fix a bug with `:ours` and `:theirs` merge tools involving conflicted trees
+  with more than two sides. [#6227](https://github.com/jj-vcs/jj/pull/6227)
 
-### New features
+### Contributors
 
-### Fixed bugs
+Thanks to the people who made this release happen!
+
+* Emily (@emilazy)
+* Ilya Grigoriev (@ilyagr)
+* Nicole Patricia Mazzuca (@strega-nil)
+* Scott Taylor (@scott2000)
+* Yuya Nishihara (@yuja)
 
 ## [0.28.0] - 2025-04-02
 

Cargo.lock

@@ -5,7 +5,7 @@ resolver = "3"
 members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
 
 [workspace.package]
-version = "0.28.0"
+version = "0.28.1"
 license = "Apache-2.0"
 rust-version = "1.84" # NOTE: remember to update CI, contributing.md, changelog.md, and install-and-setup.md
 edition = "2021"
@@ -127,8 +127,8 @@ winreg = "0.52"
 # put all inter-workspace libraries, i.e. those that use 'path = ...' here in
 # their own (alphabetically sorted) block
 
-jj-lib = { path = "lib", version = "0.28.0", default-features = false }
-jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.28.0" }
+jj-lib = { path = "lib", version = "0.28.1", default-features = false }
+jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.28.1" }
 testutils = { path = "lib/testutils" }
 
 [workspace.lints.clippy]