https://github.com/jordan-cod/actions-test
Sandbox for hotfix flow testing
https://github.com/jordan-cod/actions-test
Last synced: about 1 month ago
JSON representation
Sandbox for hotfix flow testing
- Host: GitHub
- URL: https://github.com/jordan-cod/actions-test
- Owner: jordan-cod
- Created: 2026-04-15T11:50:24.000Z (3 months ago)
- Default Branch: main
- Last Pushed: 2026-04-15T12:41:46.000Z (3 months ago)
- Last Synced: 2026-04-15T13:44:39.997Z (3 months ago)
- Size: 45.9 KB
- Stars: 0
- Watchers: 0
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# actions-test (changed by hotfix D)
Sandbox to exercise the `create-version-branch.yml` + `finish-version-branch.yml` flow end-to-end before touching the real repo.
## Branches
- `main` — production mirror
- `develop` — integration
## Flow to exercise
1. Create a fix branch from `main`
2. Merge it to `develop` (simulates "tested in dev")
3. Dispatch `Create Version Branch` with type `hotfix` → creates `hotfix/vX.Y.Z` from main, opens PR to main
4. Merge fix branch into `hotfix/vX.Y.Z` (PR)
5. Merge hotfix PR to main
6. `finish-version-branch.yml` fires → tag created + merge-back PR to develop
## Conflict scenarios to test
- A) Clean merge-back
- B) Only `package.json` `version` field diverges (auto-resolve)
- C) `package.json` with deps divergence (should open `[CONFLICT]` PR)
- D) Another file conflicts (should open `[CONFLICT]` PR)