fix(init-project,commit-change,tour): allowed-tools +Agent+Skill; conflict grep covers all unmerged codes; report-only never commits

2026-08-26 20:35:06 +02:00
parent 6eceedb8d3
commit 1743f7683f
3 changed files with 7 additions and 3 deletions
@@ -32,7 +32,7 @@ undo than not committing.

 ```bash
 git rev-parse --abbrev-ref HEAD                        # "HEAD" = detached
-git status --porcelain=v1 | grep -c '^UU\|^AA\|^DD'     # unmerged conflicts
+git status --porcelain=v1 | grep -c '^\(UU\|AA\|DD\|AU\|UA\|DU\|UD\)'   # ALL unmerged porcelain codes
 git status --porcelain=v1 | wc -l                       # nothing pending?
 git config user.email
 ```