Git Branch — Branch Management

Check Branching Strategy Config

cat .memory/git-config.md 2>/dev/null

If Branching Strategy is filled in, use the configured strategy. The detect-branching-strategy.sh hook automatically seeds on sessionStart.

If the config has Confidence: medium, confirm with the dev before using (see Detect Branching Strategy section).

Check Git State

Before starting implementation:

git branch --show-current
git status
git fetch origin

Remote Synchronization

If on main/master/develop, check synchronization:

git rev-list HEAD..origin/<branch> --count

If the main branch is behind:

Your branch [main] is [N] commits behind the remote.

I recommend updating before creating a new branch:

[P] Pull and continue
[I] Ignore and continue anyway (not recommended)
[A] Abort implementation

Evaluate Situation for Branch Creation

Automatic Creation (when there is a work item)

When the source of work is a GitHub issue or Azure DevOps work item, create the branch automatically.

Naming convention:

feature/<id>-<short-description>

Rules for <short-description>:

• Derived from the work item title
• Lowercase letters, numbers, and hyphens only
• Maximum 50 characters in the total branch name
• Remove articles, prepositions, and unnecessary words

Examples:

Action: Create branch and inform the user:

Branch created: feature/<id>-<short-description>

[C] Continue with this branch
[R] Rename branch: _

The user can rename, but the flow does not block waiting for confirmation to create.

Interactive Creation (without work item)

When the source is tasks.md (without issue/work item), ask the user:

You are on the main branch. Do you want me to create a branch for this implementation?

Suggestion: feature/<short-description>

[S] Yes, create suggested branch
[N] No, continue on current branch
[C] Create with another name: _

Existing Branch

If the user is already on a feature branch, use the current branch without additional questions.

Detect Branching Strategy

When .memory/git-config.md does not exist or does not have Branching Strategy, detect automatically:

# 1. Default branch
DEFAULT_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')

# 2. Does develop branch exist?
HAS_DEVELOP=$(git ls-remote --heads origin develop 2>/dev/null | grep -q develop && echo "yes" || echo "no")

# 3. Do release/* or hotfix/* branches exist? (GitFlow pattern)
HAS_GITFLOW_BRANCHES=$(git branch -r 2>/dev/null | grep -qE '(release|hotfix)/' && echo "yes" || echo "no")

Detection rules

High confidence — save automatically and inform:

…