Skip to content

@studnicky/git-flow@0.3.0

Choose a tag to compare

View all tags
@github-actions github-actions released this 29 Jul 14:18
@studnicky/git-flow@0.3.0
ff1f611
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode.

Minor Changes

  • #23 f6423e2 Thanks @Studnicky! - feature/release/hotfix now adapt to the target repository's actual merge settings instead of hardcoding a strategy. MergeMethodResolver resolves a real, available method from an ordered preference list (GithubPrimitives.repositoryMergeCapabilities reads allow_merge_commit/allow_rebase_merge/allow_squash_merge from the repo). Feature branches into develop still prefer squash, falling back to merge or rebase if squash happens to be disabled. Release/hotfix promotions into main never squash — merge or rebase only — since squashing collapses the promoted branch's history that the subsequent back-merge into develop depends on; if a repo only allows squash, this now fails loudly with a clear error instead of silently squashing and corrupting the next back-merge. MergeMethodEntity gains 'rebase' as a third valid value.

    feature/release/hotfix also now install a default PR template into the target repository before opening a PR, if — and only if — that repository doesn't already have one at any of GitHub's recognized template locations. Never overrides an existing template. The bundled default uses GitHub's alert callouts (> [!CAUTION]/[!IMPORTANT]/[!TIP]/[!NOTE]) to color-code Type of Change and Risk by actual severity, a collapsible <details> block for an optional change-flow diagram, and an adversarial-self-review gate ahead of the checklist instead of a habit-checked box list.

Assets 2
Loading