v1.2.1

Changed

• Merge Command Available at All Safety Levels: The merge command is now available at all safety levels (protected, balanced, unrestricted) because it has comprehensive built-in protections including pre-merge conflict detection, circular dependency validation, explicit user confirmation, and protected branch enforcement. The command itself is inherently safe regardless of the configured safety level.

Fixed

• PHPStan errors mitigated

v1.2.0

Changed

• Add more merges from main to develop to prevent drifting as much as possible
• Check merge conflicts beforehand

Fixed

• Commands now work correctly when executed from any subdirectory within a git repository
• Fixed warnings in the hotfix command

v1.1.1

[1.1.1] - 2025-01-09

Technical

• Updated commands merge conflicts resolve states with intermediate branches where needed

v1.1.0 - Merge and feature dependencies

Added

• New Merge Command

  • Safe branch merging with validation and dependency tracking
  • Automatic MERGE-DEP tag injection in merge commit messages
  • Dependency recording format: MERGE-DEP | source-branch → target-branch
  • Circular dependency validation during merge operations
  • Interactive branch selection with conflict detection
  • Safety level enforcement and educational guidance

• Dependency Tracking System

  • Automatic tracking of merge dependencies between branches via MERGE-DEP tags
  • Dependency validation during release creation
  • Auto-inclusion of dependencies when adding features/epics to releases
  • Circular dependency detection and prevention
  • Dependency graph visualization in status command

• Enhanced Status Command

  • New --dependencies flag to show dependency graph for merged items
  • Inline dependency display in detailed mode (--detailed)
  • Automatic filtering of released dependencies (already merged to main)
  • Tree-style formatting for clear dependency visualization

• Release Command Improvements

  • Interactive prompt to auto-include dependencies when creating releases
  • Validation ensures all required dependencies are included
  • Warning system for releases with unmet dependencies
  • Support for dependency chains (A depends on B depends on C)

Documentation

• Added comprehensive dependency tracking documentation to merge.md
• Updated release.md with dependency validation examples
• Enhanced status.md with dependency graph usage and examples
• Updated README.md with dependency tracking feature overview
• Added dependency tracking architecture documentation

Technical Details

• New DependencyDiscovery service for dependency scanning and validation
• Commit message parsing for MERGE-DEP tags
• Git ancestry checking for circular dependency prevention
• Efficient caching for dependency lookups

Important Notes

• Existing repositories must run gstr init to reinstall hooks - This update includes enhanced git hooks that support the new merge command and dependency tracking features. Run gstr init in each existing repository to update the hooks.

v1.0.1

Fixed

• Fixed non-selectable hotfix in hotfix start command when multiple hotfixes exist

Documentation

• Simplified README.md for end users
• Added PR-less remote workflow documentation and diagram
• Consolidated release command documentation (merged add/remove into main release.md)
• Updated command cheat sheet with accurate workflow flows
• Corrected commit tagging format documentation
• Added deployment tag operations to command references
• Documented three workflow modes (Remote with PRs, Remote PR-less, Local)

Initial release

This is the first release.