From a52a41142dab6e614484520f783151a7e426d589 Mon Sep 17 00:00:00 2001
From: Andrey Kuznetsov <andrey@onsails.com>
Date: Tue, 25 Nov 2025 00:29:44 +0400
Subject: [PATCH] chore: release v0.1.7

---
 Cargo.lock                      |  4 ++--
 Cargo.toml                      |  2 +-
 crates/ccsync-core/CHANGELOG.md | 11 +++++++++++
 crates/ccsync/CHANGELOG.md      | 11 +++++++++++
 crates/ccsync/Cargo.toml        |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c39b3a..962332f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -125,7 +125,7 @@ dependencies = [
 
 [[package]]
 name = "ccsync"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "ccsync-core"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "anyhow",
  "dirs",
diff --git a/Cargo.toml b/Cargo.toml
index 3713ed8..cd994de 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.1.6"
+version = "0.1.7"
 edition = "2024"
 authors = ["ccsync contributors"]
 license = "MIT"
diff --git a/crates/ccsync-core/CHANGELOG.md b/crates/ccsync-core/CHANGELOG.md
index dd36f72..10a27a4 100644
--- a/crates/ccsync-core/CHANGELOG.md
+++ b/crates/ccsync-core/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.7](https://github.com/onsails/ccsync/compare/ccsync-core-v0.1.6...ccsync-core-v0.1.7) - 2025-11-24
+
+### Added
+
+- add content diff viewer for directory conflicts
+
+### Fixed
+
+- resolve ConflictStrategy::Fail when user approves interactively
+- detect symlinked agents and commands
+
 ## [0.1.6](https://github.com/onsails/ccsync/compare/ccsync-core-v0.1.5...ccsync-core-v0.1.6) - 2025-11-22
 
 ### Added
diff --git a/crates/ccsync/CHANGELOG.md b/crates/ccsync/CHANGELOG.md
index 81f93ba..9afe7ae 100644
--- a/crates/ccsync/CHANGELOG.md
+++ b/crates/ccsync/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.7](https://github.com/onsails/ccsync/compare/ccsync-v0.1.6...ccsync-v0.1.7) - 2025-11-24
+
+### Added
+
+- add content diff viewer for directory conflicts
+
+### Other
+
+- clarify conflict action descriptions in interactive prompts
+- *(ui)* enhance CreateDirectory diff display with file listing
+
 ## [0.1.6](https://github.com/onsails/ccsync/compare/ccsync-v0.1.5...ccsync-v0.1.6) - 2025-11-22
 
 ### Added
diff --git a/crates/ccsync/Cargo.toml b/crates/ccsync/Cargo.toml
index 4cda43f..e7996e3 100644
--- a/crates/ccsync/Cargo.toml
+++ b/crates/ccsync/Cargo.toml
@@ -14,7 +14,7 @@ name = "ccsync"
 path = "src/main.rs"
 
 [dependencies]
-ccsync-core = { version = "0.1.6", path = "../ccsync-core" }
+ccsync-core = { version = "0.1.7", path = "../ccsync-core" }
 clap.workspace = true
 anyhow.workspace = true
 dialoguer.workspace = true