@laitszkin/apollo-toolkit 2.14.6 → 2.14.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,11 @@ All notable changes to this repository are documented in this file.
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
## [v2.14.7] - 2026-04-08
|
|
8
|
+
|
|
9
|
+
### Changed
|
|
10
|
+
- Update `merge-changes-from-local-branches` so it removes successfully merged source branches and any detached worktrees only after the merge commit and verification both succeed, while refusing forced deletion for branches that are not actually merged.
|
|
11
|
+
|
|
7
12
|
## [v2.14.6] - 2026-04-08
|
|
8
13
|
|
|
9
14
|
### Added
|
|
@@ -23,7 +23,7 @@ description: >-
|
|
|
23
23
|
## Standards
|
|
24
24
|
|
|
25
25
|
- Evidence: Inspect the current branch state, local branches, ahead/behind status, and actual conflicting files before deciding what to merge.
|
|
26
|
-
- Execution: Merge only the relevant local branches into `main` sequentially, resolve conflicts by reading both sides and editing the merged result to preserve shipped behavior, verify the merged state, then hand the final local branch state to `commit-and-push` so commit/changelog/spec-archival work happens through the shared submission workflow.
|
|
26
|
+
- Execution: Merge only the relevant local branches into `main` sequentially, resolve conflicts by reading both sides and editing the merged result to preserve shipped behavior, verify the merged state, delete each successfully merged branch and its detached worktree only after the merged result is confirmed, then hand the final local branch state to `commit-and-push` so commit/changelog/spec-archival work happens through the shared submission workflow.
|
|
27
27
|
- Quality: Never use blanket timestamp rules or default `-X ours/theirs` conflict resolution as the primary merge strategy, and do not declare success until the final `main` state has been checked and verified.
|
|
28
28
|
- Output: Produce a clean local main branch with all local changes integrated and ready for the shared submit workflow.
|
|
29
29
|
|
|
@@ -98,6 +98,21 @@ For each local branch (excluding main):
|
|
|
98
98
|
|
|
99
99
|
### 5) Hand off the merged result for shared submission handling
|
|
100
100
|
|
|
101
|
+
- After a branch has been merged successfully and the merged `main` state has been verified, remove the source branch worktree if one exists:
|
|
102
|
+
```bash
|
|
103
|
+
git worktree list
|
|
104
|
+
git worktree remove <worktree-path>
|
|
105
|
+
```
|
|
106
|
+
- Delete only branches that were merged successfully:
|
|
107
|
+
```bash
|
|
108
|
+
git branch -d <branch-name>
|
|
109
|
+
```
|
|
110
|
+
- If a branch still has an attached worktree, remove the worktree before deleting the branch.
|
|
111
|
+
- Never delete:
|
|
112
|
+
- `main`
|
|
113
|
+
- the currently checked-out branch
|
|
114
|
+
- branches that were skipped, failed to merge, or still need manual follow-up
|
|
115
|
+
- If `git branch -d` refuses deletion because the branch is not actually merged, stop and report the branch instead of forcing deletion with `-D`.
|
|
101
116
|
- Once merge verification passes, invoke `commit-and-push` for the authoritative local branch so the final submission flow owns:
|
|
102
117
|
- `CHANGELOG.md` readiness
|
|
103
118
|
- any required `archive-specs` run
|
|
@@ -123,6 +138,7 @@ For each local branch (excluding main):
|
|
|
123
138
|
- Keep the main branch history clean and readable.
|
|
124
139
|
- If a branch's merge breaks tests, resolve the conflict differently before committing.
|
|
125
140
|
- Do not stash or discard unrelated work automatically; stop when the working tree state makes the merge ambiguous.
|
|
141
|
+
- Delete merged source branches and their detached worktrees only after the merge commit and verification both succeed.
|
|
126
142
|
|
|
127
143
|
## Conflict Resolution Examples
|
|
128
144
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
interface:
|
|
2
2
|
display_name: "Merge Changes from Local Branches"
|
|
3
3
|
short_description: "Merge relevant local branches into main with verified conflict resolution"
|
|
4
|
-
default_prompt: "Use $merge-changes-from-local-branches to inventory local branches, merge only the relevant ones into local main, resolve conflicts by reading and composing the correct behavior instead of relying on blanket merge strategies, run targeted verification after conflictful merges, and leave remote state untouched."
|
|
4
|
+
default_prompt: "Use $merge-changes-from-local-branches to inventory local branches, merge only the relevant ones into local main, resolve conflicts by reading and composing the correct behavior instead of relying on blanket merge strategies, run targeted verification after conflictful merges, delete successfully merged source branches and detached worktrees only after verification succeeds, and leave remote state untouched."
|
package/package.json
CHANGED