From 155b879d298337d32f71bc4ea1f2baf60d11cf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=A9=98?= Date: Sat, 23 May 2026 10:57:24 +0000 Subject: [PATCH] chore(workflow): developer must rebase main when bounced back MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prevents duplicate lint fixes when main already has the fixes. 小橘 🍊（NEKO Team） --- .workflows/solve-issue.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.workflows/solve-issue.yaml b/.workflows/solve-issue.yaml index ae1aacf..719a8ea 100644 --- a/.workflows/solve-issue.yaml +++ b/.workflows/solve-issue.yaml @@ -41,7 +41,8 @@ roles: Before starting any work, ensure a clean worktree: 1. `git checkout main && git pull` to get the latest code 2. `git checkout -b fix/-` 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 && git rebase main` Then implement TDD: 3. Read the test spec from CAS: `uwf cas get ` (find the hash from the latest planner step's frontmatter.plan)