busya/ss-tools
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

rebase rework

Browse Source
This commit is contained in:
busya
2026-03-09 13:19:06 +03:00
parent c7e9b5b6c5
commit 309dfdba86
12 changed files with 1010 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
specs/011-git-integration-dashboard/tasks.md
View File

@@ -2,7 +2,7 @@
**Feature**: Git Integration for Dashboard Development
**Status**: Completed
**Total Tasks**: 35
**Total Tasks**: 43
## Phase 1: Setup
**Goal**: Initialize project structure and dependencies.
@@ -92,4 +92,17 @@
- [x] D001 Diagnose source-of-truth mismatch for server URL in push flow
- [x] D002 Validate diagnosis with backend push diagnostics logs
- [x] D003 Apply behavioral fix only after diagnosis confirmation
- [x] D003 Apply behavioral fix only after diagnosis confirmation
## Phase 10: Operational Debug (2026-03-08)
**Goal**: Diagnose unexpected 409 on pull caused by unfinished merge detection.
- [x] D004 Add pull diagnostics logs for merge marker, repo path, branch, and binding metadata
- [x] D005 Confirm root cause hypothesis from new diagnostics before applying any behavior fix
- [x] D006 Implement richer 409 API response for unfinished merge (repo path, branch, explicit manual steps)
## Phase 11: Operational Debug (2026-03-08)
**Goal**: Add GitManager remediation dialog for unfinished merge 409 with actionable guidance.
- [x] D007 Implement unresolved-merge resolution dialog in `frontend/src/components/git/GitManager.svelte`
- [x] D008 Add frontend contract test for unfinished-merge dialog behavior in `frontend/src/components/git/__tests__/git_manager.unfinished_merge.integration.test.js`