Eagers Conventions

Git and PR conventions for Eagers Automotive projects.

Detection

Match when:

•Remote URL contains dev.azure.com/eagersautomotive/
•Local email ends with @eagersa.com.au

Platform

•Platform: Azure DevOps
•CLI: az repos and az boards
•Reference: See azure-devops skill for CLI command syntax

Branch Strategy

Long-Lived Branches

•epic/<name> - Long-lived integration branch for large initiatives. Feature branches merge into this, then eventually merges to main.
•main - Production branch

Short-Lived Branches (branch from epic or main)

•feature/<feature-name>/<pbi-name> - For new work under a feature
•fix/<name> - Bug fixes
•fix/<work-item-id>/<name> - Bug fixes linked to work item

Workflow

Key principle: The branch you branch FROM is your PR target.

With epic branch (large initiative):

code

main ← PR target for epic branches
  └─ epic/<epic-name> ← PR target for feature branches under this epic
       ├─ feature/<feature-name>/<pbi-name>
       ├─ feature/<feature-name>/<another-pbi>
       └─ ...

Without epic branch (smaller work):

code

main ← PR target for feature branches
  ├─ feature/<feature-name>/<pbi-name>
  ├─ feature/<feature-name>/<another-pbi>
  └─ ...

•Branch from main → PR into main
•Branch from epic/* → PR into that epic/* (treat epic as "main" for this work)

When the epic is complete, PR the epic branch into main.

Branch Naming Rules

•No work item IDs in branch names (IDs can change, work can be reassigned)
•Work item linking belongs in PRs, not branch names
•Use descriptive kebab-case names

Commit Messages

•Concise, single line
•Imperative mood
•Work item reference optional in commits (required in PR)

PR Description Format

markdown

## Summary

Brief description of the changes.

## Related Work Items

#1234

#5678

## Changes

- Change 1
- Change 2

## Test Plan

- [ ] Test case 1
- [ ] Test case 2

Note: Work item links (#1234) must be on separate lines with blank lines between for proper rendering.

Work Item Linking

•Format: #1234 (Azure DevOps auto-links)
•In PR description: Required
•In commits: Optional

Workflow

•Identify or create the Feature under the relevant Epic
•Create PBIs under the Feature, assign to current sprint
•Create Tasks under each PBI, assign to current sprint
•Create PR referencing PBIs in description
•Work items auto-link to PR

Project: easypass (Customer-Interactions)

Area Paths & Iterations

•Area Path: Uplift\easypass
•Parent Iteration: Uplift\easypass (for Features and above)
•Sprint Iterations: Uplift\easypass\easypass v0.4, Uplift\easypass\easypass v1.0, etc.

Assignment Rules

Work Item Type	Area Path	Iteration Path
Initiative	`Uplift\easypass`	`Uplift\easypass` (parent)
Epic	`Uplift\easypass`	`Uplift\easypass` (parent)
Feature	`Uplift\easypass`	`Uplift\easypass` (parent)
PBI	`Uplift\easypass`	`Uplift\easypass\<current sprint>`
Task	`Uplift\easypass`	`Uplift\easypass\<current sprint>`

Finding Current Sprint

bash

az boards iteration project list --project "Uplift" --path "\\Uplift\\Iteration\\easypass" --depth 2 -o json | jq '.children[] | {name: .name, start: .attributes.startDate, finish: .attributes.finishDate}'

The current sprint is where today's date falls between startDate and finishDate.

Example Work Item Hierarchy

code

Initiative #9582: easypass Application
  └─ Epic #9651: Buy A Car
       └─ Feature #9652: Database v2 entity design
            └─ PBI #9653: Create self-contained v2 types
                 ├─ Task #9654: Split InteractionEntityV2.ts into domain modules
                 ├─ Task #9655: Create type guards and assertions
                 └─ Task #9656: Move V0/V1 types to legacy directory

CLI Examples

bash

# Create work item for easypass
az boards work-item create --type "Task" --title "My task" --project "Uplift" --area "Uplift\\easypass" --iteration "Uplift\\easypass\\easypass v0.4"

# Update iteration
az boards work-item update --id 1234 --fields "System.IterationPath=Uplift\\easypass\\easypass v0.4"

# List easypass iterations
az boards iteration project list --project "Uplift" -o json | jq '.children[] | {name: .name, path: .path}'