2 Commits

Author	SHA1	Message	Date
Steve Yegge	999abe672c	feat: add FetchBranch and CheckConflicts for merge queue ... 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>	2025-12-18 20:17:42 -08:00
Steve Yegge	f46a1e6eab	feat: add git wrapper package for subprocess operations ... Operations: - Clone, Checkout, Fetch, Pull, Push - Add, Commit, CommitAll - Status, CurrentBranch, HasUncommittedChanges, RemoteURL - Merge, Rebase, AbortMerge, AbortRebase - CreateBranch, DeleteBranch, Rev, IsAncestor Error handling: - Detects ErrNotARepo, ErrMergeConflict, ErrAuthFailure, ErrRebaseConflict - Wraps git stderr in error messages Closes gt-u1j.3 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>	2025-12-16 13:27:03 -08:00