0 Fork 0

Files

T

tmu d646fd1ec4 ♻️ Let create:branch start from an ahead main

`create:finish` leaves the merge local until `create:release` pushes it, so
`main` is routinely ahead of its upstream between a merge and a release. The
branch front door demanded an exact match and refused until it was pushed,
forcing a manual `git push` that the model deliberately keeps out of it.

Reject only a `main` that is behind its upstream — matching `create:finish`,
which already tolerates being ahead — and record why pushing from `finish` was
rejected instead. The push stays with `create:release`, so the merge remains
reviewable locally, and the known issue about the deadlock is gone.

Resolves: backlog task "Resolve the finish/push tension".

2026-09-15 22:14:51 +00:00

1.7 KiB

Raw Blame History

Changelog

All notable changes to this project will be documented in this file.

The format is based on Keep a Changelog, and this project adheres to Semantic Versioning.

Unreleased

require a short summary under [Unreleased] in the changelog before a branch is finished
let create:branch start from a main that is ahead of its upstream, so a finished merge no longer blocks the next branch until it is pushed

0.1.6 - 2026-09-15

restructure the documentation: README.md for users, CONTRIBUTING.md for contributors, and development/ for the decisions, rejected alternatives and known issues
document the decisions and known issues for CI, tooling, testing, publishing and the workflow

0.1.5 - 2026-09-15

improve CI configuration

0.1.4 - 2026-09-14

fix CI to node from custom image
upgrade dependencies

0.1.3 - 2026-09-14

change to custom image for CI

0.1.2 - 2026-09-14

upgrade dependencies

0.1.1 - 2026-09-14

upgrade dependencies

0.1.0 - 2026-09-14

basic setup

1.7 KiB Raw Blame History