shazhou/united-workforce
8
0
Fork 0
Code Issues 8 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

chore(workflow): developer must rebase main when bounced back

Browse Source 
Prevents duplicate lint fixes when main already has the fixes.

小橘 🍊（NEKO Team）
This commit is contained in:
小橘
2026-05-23 10:57:24 +00:00
parent c1f04929f4
commit 155b879d29
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.workflows/solve-issue.yaml
+2 -1
View File
@@ -41,7 +41,8 @@ roles:
Before starting any work, ensure a clean worktree: Before starting any work, ensure a clean worktree:
1. `git checkout main && git pull` to get the latest code 1. `git checkout main && git pull` to get the latest code
2. `git checkout -b fix/<issue-number>-<short-description>` to create a fresh branch 2. `git checkout -b fix/<issue-number>-<short-description>` to create a fresh branch
- If bounced back from reviewer or tester, reuse the existing branch instead - If bounced back from reviewer or tester, reuse the existing branch and rebase onto latest main:
`git checkout main && git pull && git checkout <branch> && git rebase main`
Then implement TDD: Then implement TDD:
3. Read the test spec from CAS: `uwf cas get <plan hash>` (find the hash from the latest planner step's frontmatter.plan) 3. Read the test spec from CAS: `uwf cas get <plan hash>` (find the hash from the latest planner step's frontmatter.plan)