999abe672c
Add git helper functions for merge request conflict checking: - FetchBranch(remote, branch): fetch a specific branch from remote - CheckConflicts(source, target): test merge to detect conflicts - Returns list of conflicting files without modifying working directory - runMergeCheck helper to capture stdout (where CONFLICT appears) Tests cover clean merges, conflicting merges, and working dir cleanup. Closes gt-3x1.2 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Gastown (Go)
Go port of Gas Town - a multi-agent workspace manager.
Status
Work in Progress - This is the Go rewrite of the Python gastown tool.
See the Python version for current functionality.
Goals
- Single binary installation (
gt) - Self-diagnosing (
gt doctor) - Federation support (coordinate agents across VMs)
- Performance improvements over Python version
Development
# Build
go build -o gt ./cmd/gt
# Run
./gt --help
Related
- gastown-py - Python version (current)
- beads - Issue tracking for agents