v0.13.1 — AST-Level Branch Merge with Conflict Resolution

aura merge <branch> — Smarter Than Git Merge

How it works

aura merge feature/auth

1. Pulls all function bodies from feature/auth on the mothership
2. Compares each function against your local files by content hash (not line numbers)
3. Classifies every function:
   • New (only on source branch) → auto-applied
   • Identical (same on both) → skipped
   • Conflict (different on both) → interactive resolution

Interactive Conflict Resolution

For each conflicting function, you see both versions and choose:

• Keep local (yours)
• Accept remote (theirs)
• Keep both (remote added as commented code)

Every modification is snapshotted first → recoverable via aura rewind.

Why it's better than git merge

• Git sees "line 47 changed in both branches" → CONFLICT
• Aura sees "Person A edited login(), Person B edited validate()" → auto-merge, zero conflict
• Only flags conflicts when two people edit the same function

Flags

• --dry-run — show what would change without applying
• --auto — auto-accept all non-conflicting changes, keep local for conflicts

Update

sudo aura update

Full Changelog: v0.13.0...v0.13.1