Add team tasks: several agents in one worktree sharing a board

2026-10-18 08:48:57 -07:00
parent 7f62df19d2
commit 6bcde13b2f
31 changed files with 1392 additions and 439 deletions
@@ -298,6 +298,20 @@ func IsAncestor(dir, ancestor, descendant string) (bool, error) {
 	return false, fmt.Errorf("git merge-base --is-ancestor %s %s: exit status %d: %s", ancestor, descendant, code, stderr)
 }

+func MergeInProgress(dir string) (bool, error) {
+	_, _, code, err := runCode(dir, nil, "rev-parse", "--quiet", "--verify", "MERGE_HEAD")
+	return err == nil && code == 0, err
+}
+
+func AbortMerge(dir string) error {
+	merging, err := MergeInProgress(dir)
+	if err != nil || !merging {
+		return err
+	}
+	_, err = run(dir, "merge", "--abort")
+	return err
+}
+
 func ReadFile(repo, rev, path string) (string, bool, error) {
 	_, _, code, err := runCode(repo, nil, "cat-file", "-e", rev+":"+path)
 	if err != nil {