Skip to content

Commit 8fa10b2

Browse files
committed
docs: Add CHANGELOG entry for v0.10.10
1 parent 8fff7b2 commit 8fa10b2

1 file changed

Lines changed: 21 additions & 0 deletions

File tree

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.10.10] - 2025-12-04
11+
12+
### Added
13+
14+
- **Smart auto-merge with major edit detection**: Enhanced merge conflict resolution during `tsk sync`
15+
- Detects major edit sessions (2+ content fields changed OR title/description significantly different)
16+
- Context-aware list merging: respects local changes during major edits, uses union for incremental changes
17+
- Fixes issue where removed tags were brought back by auto-merge during active editing
18+
- Major edits are detected using text similarity analysis (title <70% similar OR description <50% similar)
19+
20+
### Improved
21+
22+
- **Code centralization in merge logic**: Better maintainability and consistency
23+
- Added constants for field categories (SIMPLE_FIELDS, DATE_FIELDS, LIST_FIELDS, SEMANTIC_FIELDS, CONTENT_FIELDS)
24+
- Added threshold constants (TITLE_SIMILARITY_THRESHOLD, DESCRIPTION_SIMILARITY_THRESHOLD, etc.)
25+
- Created reusable helper functions:
26+
- `_calculate_text_similarity()`: DRY for text comparison using SequenceMatcher
27+
- `_copy_task_from()`: DRY for task copying
28+
- `_resolve_semantic_conflict()`: Generic semantic resolution pattern
29+
- Refactored all merge functions to use centralized components
30+
1031
## [0.10.9] - 2025-11-19
1132

1233
### Fixed

0 commit comments

Comments
 (0)