Hunknote automatically detects merge states.
Detected States
| State | Detection | Behavior |
|---|---|---|
| Merge in progress | .git/MERGE_HEAD exists | Type: merge |
| Conflict resolution | MERGE_HEAD + resolved conflicts | Type: merge |
| Normal commit | No MERGE_HEAD | Normal type selection |
Merge Message Format
merge(auth): Merge branch feature-auth into main
Integrate the feature-auth branch which adds user
authentication with JWT tokens.
Changes:
- Add login and logout endpoints
- Implement JWT token validation