Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .devcontainer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **Sync-main-to-dev conflict detection uses merge-tree** ([#410](https://github.com/vig-os/devcontainer/issues/410))
- Replace working-tree trial merge with `git merge-tree --write-tree` so clean merges are not mislabeled as conflicts
- Enable auto-merge when dev merges cleanly with main; print merge-tree output on conflicts; fail the step on unexpected errors
- **Smoke-test release phase 2 branch-not-found failure** ([#419](https://github.com/vig-os/devcontainer/issues/419))
- Merge phase 2 (`on-release-pr-merge.yml`) back into `repository-dispatch.yml` so the release runs while `release/<version>` still exists, matching the normal release flow
- Remove `on-release-pr-merge.yml` from the smoke-test template

- **Release finalization now commits generated docs and refreshes PR content** ([#300](https://github.com/vig-os/devcontainer/issues/300))
- Final release automation regenerates docs before committing so pre-commit `generate-docs` does not fail CI with tracked file diffs
Expand Down
2 changes: 1 addition & 1 deletion .vig-os
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# vig-os devcontainer configuration
DEVCONTAINER_VERSION=0.3.1-rc13
DEVCONTAINER_VERSION=0.3.1-rc14
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **Sync-main-to-dev conflict detection uses merge-tree** ([#410](https://github.com/vig-os/devcontainer/issues/410))
- Replace working-tree trial merge with `git merge-tree --write-tree` so clean merges are not mislabeled as conflicts
- Enable auto-merge when dev merges cleanly with main; print merge-tree output on conflicts; fail the step on unexpected errors
- **Smoke-test release phase 2 branch-not-found failure** ([#419](https://github.com/vig-os/devcontainer/issues/419))
- Merge phase 2 (`on-release-pr-merge.yml`) back into `repository-dispatch.yml` so the release runs while `release/<version>` still exists, matching the normal release flow
- Remove `on-release-pr-merge.yml` from the smoke-test template

- **Release finalization now commits generated docs and refreshes PR content** ([#300](https://github.com/vig-os/devcontainer/issues/300))
- Final release automation regenerates docs before committing so pre-commit `generate-docs` does not fail CI with tracked file diffs
Expand Down
Loading