gitgrip 0.19.0

Multi-repo workflow tool - manage multiple git repositories as one
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
//! PR merge command implementation

use super::create::has_commits_ahead;
use crate::cli::output::Output;
use crate::core::manifest::Manifest;
use crate::core::repo::{get_manifest_repo_info, RepoInfo};
use crate::git::{get_current_branch, open_repo, path_exists};
use crate::platform::traits::{HostingPlatform, PlatformError};
use crate::platform::{get_platform_adapter, CheckState, MergeMethod};
use std::path::Path;
use std::sync::Arc;

/// Auto-detect the best merge method for a repo when none is specified.
///
/// Queries the repo's allowed merge methods and picks the first available
/// in preference order: squash > merge > rebase.  Falls back to the
/// default (merge) if the query fails.
async fn detect_merge_method(
    platform: &dyn HostingPlatform,
    owner: &str,
    repo: &str,
) -> MergeMethod {
    match platform.get_allowed_merge_methods(owner, repo).await {
        Ok(allowed) => {
            if allowed.squash {
                MergeMethod::Squash
            } else if allowed.merge {
                MergeMethod::Merge
            } else if allowed.rebase {
                MergeMethod::Rebase
            } else {
                MergeMethod::default()
            }
        }
        Err(_) => MergeMethod::default(),
    }
}

/// Options for the PR merge command.
pub struct MergeOptions<'a> {
    pub method: Option<&'a crate::platform::MergeMethod>,
    pub force: bool,
    pub update: bool,
    pub auto: bool,
    pub json: bool,
    pub wait: bool,
    pub timeout: u64,
    pub delete_branch: bool,
}

/// Run the PR merge command
pub async fn run_pr_merge(
    workspace_root: &Path,
    manifest: &Manifest,
    opts: &MergeOptions<'_>,
) -> anyhow::Result<()> {
    if !opts.json {
        Output::header("Merging pull requests...");
        println!();
    }

    let repos: Vec<RepoInfo> = manifest
        .repos
        .iter()
        .filter_map(|(name, config)| {
            RepoInfo::from_config(
                name,
                config,
                workspace_root,
                &manifest.settings,
                manifest.remotes.as_ref(),
            )
        })
        .filter(|r| !r.reference) // Skip reference repos
        .collect();

    let merge_method = opts.method.copied().unwrap_or_default();

    // Also check manifest repo if configured
    let mut all_repos = repos.clone();
    if let Some(manifest_repo) = get_manifest_repo_info(manifest, workspace_root) {
        // Only add manifest repo if it has changes
        match check_repo_for_changes(&manifest_repo) {
            Ok(true) => {
                all_repos.push(manifest_repo);
            }
            Ok(false) => {
                Output::info("manifest: no changes, skipping");
            }
            Err(e) => {
                Output::warning(&format!("manifest: could not check for changes: {}", e));
            }
        }
    }

    // Collect PRs to merge
    #[derive(Debug, Clone, Copy)]
    enum CheckStatus {
        Passing,
        Failing,
        Pending,
        Unknown,
    }

    struct PRToMerge {
        repo_name: String,
        owner: String,
        repo: String,
        branch: String,
        pr_number: u64,
        platform: Arc<dyn crate::platform::HostingPlatform>,
        approved: bool,
        check_status: CheckStatus,
        mergeable: bool,
    }

    let mut prs_to_merge: Vec<PRToMerge> = Vec::new();
    let mut json_skipped: Vec<String> = Vec::new();

    for repo in &all_repos {
        if !path_exists(&repo.absolute_path) {
            continue;
        }

        let git_repo = match open_repo(&repo.absolute_path) {
            Ok(r) => r,
            Err(_) => continue,
        };

        let branch = match get_current_branch(&git_repo) {
            Ok(b) => b,
            Err(_) => continue,
        };

        // Skip if on target branch
        if branch == repo.target_branch() {
            continue;
        }

        let platform = get_platform_adapter(repo.platform_type, repo.platform_base_url.as_deref());

        match platform
            .find_pr_by_branch(&repo.owner, &repo.repo, &branch)
            .await
        {
            Ok(Some(pr)) => {
                // Get PR details
                let (approved, mergeable) = match platform
                    .get_pull_request(&repo.owner, &repo.repo, pr.number)
                    .await
                {
                    Ok(full_pr) => {
                        let is_approved = platform
                            .is_pull_request_approved(&repo.owner, &repo.repo, pr.number)
                            .await
                            .unwrap_or(false);
                        (is_approved, full_pr.mergeable.unwrap_or(false))
                    }
                    Err(_) => (false, false),
                };

                // Get status checks
                let check_status = match platform
                    .get_status_checks(&repo.owner, &repo.repo, &branch)
                    .await
                {
                    Ok(status) => {
                        // Successfully got check status
                        if status.state == CheckState::Failure {
                            // Checks are actually failing
                            CheckStatus::Failing
                        } else if status.state == CheckState::Pending {
                            // Checks still running - don't block but warn
                            CheckStatus::Pending
                        } else {
                            CheckStatus::Passing
                        }
                    }
                    Err(e) => {
                        // Could not determine check status
                        // Don't block merge due to API issues
                        Output::warning(&format!(
                            "{}: Could not check CI status for PR #{}: {}",
                            repo.name, pr.number, e
                        ));
                        CheckStatus::Unknown
                    }
                };

                prs_to_merge.push(PRToMerge {
                    repo_name: repo.name.clone(),
                    owner: repo.owner.clone(),
                    repo: repo.repo.clone(),
                    branch: branch.clone(),
                    pr_number: pr.number,
                    platform,
                    approved,
                    check_status,
                    mergeable,
                });
            }
            Ok(None) => {
                if !opts.json {
                    Output::info(&format!("{}: no open PR for this branch", repo.name));
                }
                json_skipped.push(repo.name.clone());
            }
            Err(e) => {
                if !opts.json {
                    Output::error(&format!("{}: {}", repo.name, e));
                }
            }
        }
    }

    if prs_to_merge.is_empty() {
        println!("No open PRs found for any repository.");
        println!("Repositories checked: {}", all_repos.len());
        return Ok(());
    }

    // Show which repos have PRs and which don't
    let repos_with_prs: Vec<String> = prs_to_merge.iter().map(|p| p.repo_name.clone()).collect();
    let repos_without_prs: Vec<String> = all_repos
        .iter()
        .filter(|r| !repos_with_prs.contains(&r.name))
        .map(|r| r.name.clone())
        .collect();

    if !repos_without_prs.is_empty() {
        Output::info(&format!(
            "Merging {} repo(s) with open PRs. {} repo(s) have no open PRs and will be skipped.",
            prs_to_merge.len(),
            repos_without_prs.len()
        ));
        for repo_name in &repos_without_prs {
            Output::info(&format!("  - {}: skipped (no open PR)", repo_name));
        }
        println!();
    }

    // Wait for checks to pass if --wait
    if opts.wait {
        let any_pending = prs_to_merge
            .iter()
            .any(|pr| matches!(pr.check_status, CheckStatus::Pending));

        if any_pending {
            let start = std::time::Instant::now();
            let timeout_duration = std::time::Duration::from_secs(opts.timeout);

            let spinner = Output::spinner("Waiting for checks to pass...");

            loop {
                let pending_count = prs_to_merge
                    .iter()
                    .filter(|pr| matches!(pr.check_status, CheckStatus::Pending))
                    .count();

                if pending_count == 0 {
                    break;
                }

                if start.elapsed() > timeout_duration {
                    spinner.finish_with_message("Timed out waiting for checks");
                    anyhow::bail!(
                        "Timed out after {} seconds waiting for checks to pass",
                        opts.timeout
                    );
                }

                // Early exit if all remaining non-passing checks have definitively failed
                let all_resolved = prs_to_merge
                    .iter()
                    .all(|pr| !matches!(pr.check_status, CheckStatus::Pending));
                if all_resolved {
                    break;
                }

                let elapsed = start.elapsed().as_secs();
                spinner.set_message(format!(
                    "Waiting for checks... ({} pending, {}s elapsed)",
                    pending_count, elapsed
                ));

                tokio::time::sleep(std::time::Duration::from_secs(15)).await;

                // Re-poll check status for pending PRs
                for pr in &mut prs_to_merge {
                    if !matches!(pr.check_status, CheckStatus::Pending) {
                        continue;
                    }

                    match pr
                        .platform
                        .get_status_checks(&pr.owner, &pr.repo, &pr.branch)
                        .await
                    {
                        Ok(status) => {
                            pr.check_status = match status.state {
                                CheckState::Failure => CheckStatus::Failing,
                                CheckState::Pending => CheckStatus::Pending,
                                _ => CheckStatus::Passing,
                            };

                            match pr.check_status {
                                CheckStatus::Passing => {
                                    Output::success(&format!(
                                        "{} PR #{}: checks passed",
                                        pr.repo_name, pr.pr_number
                                    ));
                                }
                                CheckStatus::Failing => {
                                    Output::error(&format!(
                                        "{} PR #{}: checks failed",
                                        pr.repo_name, pr.pr_number
                                    ));
                                }
                                _ => {}
                            }
                        }
                        Err(_) => {
                            // Keep as pending, will retry next iteration
                        }
                    }
                }
            }

            spinner.finish_with_message("All checks resolved");
            println!();
        }
    }

    // Check readiness if not forcing
    if !opts.force {
        let mut issues = Vec::new();
        for pr in &prs_to_merge {
            if !pr.approved {
                issues.push(format!(
                    "{} PR #{}: not approved",
                    pr.repo_name, pr.pr_number
                ));
            }
            match pr.check_status {
                CheckStatus::Failing => {
                    issues.push(format!(
                        "{} PR #{}: checks failing",
                        pr.repo_name, pr.pr_number
                    ));
                }
                CheckStatus::Pending => {
                    issues.push(format!(
                        "{} PR #{}: checks still running",
                        pr.repo_name, pr.pr_number
                    ));
                }
                CheckStatus::Unknown => {
                    // Don't block on unknown - warn but allow merge
                    Output::warning(&format!(
                        "{} PR #{}: check status unknown - proceeding with caution",
                        pr.repo_name, pr.pr_number
                    ));
                }
                CheckStatus::Passing => {} // All good
            }
            if !pr.mergeable {
                issues.push(format!(
                    "{} PR #{}: not mergeable (branch may be behind base — try --update)",
                    pr.repo_name, pr.pr_number
                ));
            }
        }

        if !issues.is_empty() {
            Output::warning("Some PRs have issues:");
            for issue in &issues {
                println!("  - {}", issue);
            }
            println!();
            println!("Use --force to merge anyway.");
            return Ok(());
        }
    }

    // Auto-merge flow: enable auto-merge and return early
    if opts.auto {
        let mut success_count = 0;
        let mut error_count = 0;

        for pr in prs_to_merge {
            let effective_method = if opts.method.is_some() {
                merge_method
            } else {
                detect_merge_method(pr.platform.as_ref(), &pr.owner, &pr.repo).await
            };

            let spinner = Output::spinner(&format!(
                "Enabling auto-merge for {} PR #{} ({:?})...",
                pr.repo_name, pr.pr_number, effective_method
            ));

            match pr
                .platform
                .enable_auto_merge(&pr.owner, &pr.repo, pr.pr_number, Some(effective_method))
                .await
            {
                Ok(true) => {
                    spinner.finish_with_message(format!(
                        "{}: PR #{} will auto-merge when checks pass",
                        pr.repo_name, pr.pr_number
                    ));
                    success_count += 1;
                }
                Ok(false) => {
                    spinner.finish_with_message(format!(
                        "{}: PR #{} auto-merge could not be enabled",
                        pr.repo_name, pr.pr_number
                    ));
                    error_count += 1;
                }
                Err(e) => {
                    spinner.finish_with_message(format!("{}: failed - {}", pr.repo_name, e));
                    error_count += 1;
                }
            }
        }

        println!();
        if error_count == 0 {
            Output::success(&format!(
                "Auto-merge enabled for {} PR(s). They will merge when all checks pass.",
                success_count
            ));
        } else {
            Output::warning(&format!(
                "{} auto-merge enabled, {} failed",
                success_count, error_count
            ));
        }

        return Ok(());
    }

    // Merge PRs
    let mut success_count = 0;
    let mut error_count = 0;

    #[derive(serde::Serialize)]
    struct JsonMergedPr {
        repo: String,
        pr_number: u64,
    }
    #[derive(serde::Serialize)]
    struct JsonFailedPr {
        repo: String,
        pr_number: u64,
        reason: String,
    }
    let mut json_merged: Vec<JsonMergedPr> = Vec::new();
    let mut json_failed_prs: Vec<JsonFailedPr> = Vec::new();

    for pr in prs_to_merge {
        // Auto-detect merge method per repo when not explicitly set (#380)
        let effective_method = if opts.method.is_some() {
            merge_method
        } else {
            detect_merge_method(pr.platform.as_ref(), &pr.owner, &pr.repo).await
        };

        let spinner = if !opts.json {
            Some(Output::spinner(&format!(
                "Merging {} PR #{} ({:?})...",
                pr.repo_name, pr.pr_number, effective_method
            )))
        } else {
            None
        };

        let merge_result = pr
            .platform
            .merge_pull_request(
                &pr.owner,
                &pr.repo,
                pr.pr_number,
                Some(effective_method),
                opts.delete_branch,
            )
            .await;

        // Handle BranchBehind with --update retry
        let merge_result = match merge_result {
            Err(PlatformError::BranchBehind(ref msg)) if opts.update => {
                if let Some(ref s) = spinner {
                    s.finish_with_message(format!(
                        "{}: branch behind base, updating...",
                        pr.repo_name
                    ));
                }
                let update_spinner = if !opts.json {
                    Some(Output::spinner(&format!(
                        "Updating {} PR #{} branch...",
                        pr.repo_name, pr.pr_number
                    )))
                } else {
                    None
                };

                match pr
                    .platform
                    .update_branch(&pr.owner, &pr.repo, pr.pr_number)
                    .await
                {
                    Ok(true) => {
                        if let Some(ref s) = update_spinner {
                            s.finish_with_message(format!(
                                "{}: branch updated, retrying merge...",
                                pr.repo_name
                            ));
                        }
                        tokio::time::sleep(std::time::Duration::from_secs(3)).await;

                        let retry_spinner = if !opts.json {
                            Some(Output::spinner(&format!(
                                "Merging {} PR #{}...",
                                pr.repo_name, pr.pr_number
                            )))
                        } else {
                            None
                        };

                        match pr
                            .platform
                            .merge_pull_request(
                                &pr.owner,
                                &pr.repo,
                                pr.pr_number,
                                Some(effective_method),
                                opts.delete_branch,
                            )
                            .await
                        {
                            Ok(merged) => {
                                let verified = match pr
                                    .platform
                                    .get_pull_request(&pr.owner, &pr.repo, pr.pr_number)
                                    .await
                                {
                                    Ok(verified_pr) => verified_pr.merged,
                                    Err(_) => merged,
                                };

                                if verified {
                                    if let Some(ref s) = retry_spinner {
                                        s.finish_with_message(format!(
                                            "{}: merged PR #{}",
                                            pr.repo_name, pr.pr_number
                                        ));
                                    }
                                    success_count += 1;
                                    json_merged.push(JsonMergedPr {
                                        repo: pr.repo_name.clone(),
                                        pr_number: pr.pr_number,
                                    });
                                } else if merged {
                                    if let Some(ref s) = retry_spinner {
                                        s.finish_with_message(format!(
                                            "{}: PR #{} merge reported success but PR is not merged",
                                            pr.repo_name, pr.pr_number
                                        ));
                                    }
                                    error_count += 1;
                                    json_failed_prs.push(JsonFailedPr {
                                        repo: pr.repo_name.clone(),
                                        pr_number: pr.pr_number,
                                        reason: "merge reported success but PR is not merged"
                                            .to_string(),
                                    });
                                } else {
                                    if let Some(ref s) = retry_spinner {
                                        s.finish_with_message(format!(
                                            "{}: PR #{} was already merged",
                                            pr.repo_name, pr.pr_number
                                        ));
                                    }
                                    success_count += 1;
                                    json_merged.push(JsonMergedPr {
                                        repo: pr.repo_name.clone(),
                                        pr_number: pr.pr_number,
                                    });
                                }
                                continue;
                            }
                            Err(e) => Err(e),
                        }
                    }
                    Ok(false) => {
                        if let Some(ref s) = update_spinner {
                            s.finish_with_message(format!(
                                "{}: branch already up to date",
                                pr.repo_name
                            ));
                        }
                        Err(PlatformError::BranchBehind(msg.clone()))
                    }
                    Err(update_err) => {
                        if let Some(ref s) = update_spinner {
                            s.finish_with_message(format!(
                                "{}: branch update failed - {}",
                                pr.repo_name, update_err
                            ));
                        }
                        Err(PlatformError::BranchBehind(msg.clone()))
                    }
                }
            }
            other => other,
        };

        match merge_result {
            Ok(merged) => {
                let verified = match pr
                    .platform
                    .get_pull_request(&pr.owner, &pr.repo, pr.pr_number)
                    .await
                {
                    Ok(verified_pr) => verified_pr.merged,
                    Err(_) => merged,
                };

                if verified {
                    if let Some(ref s) = spinner {
                        s.finish_with_message(format!(
                            "{}: merged PR #{}",
                            pr.repo_name, pr.pr_number
                        ));
                    }
                    success_count += 1;
                    json_merged.push(JsonMergedPr {
                        repo: pr.repo_name.clone(),
                        pr_number: pr.pr_number,
                    });
                } else if merged {
                    if let Some(ref s) = spinner {
                        s.finish_with_message(format!(
                            "{}: PR #{} merge reported success but PR is not merged — check branch protection or required checks",
                            pr.repo_name, pr.pr_number
                        ));
                    }
                    error_count += 1;
                    json_failed_prs.push(JsonFailedPr {
                        repo: pr.repo_name.clone(),
                        pr_number: pr.pr_number,
                        reason: "merge reported success but PR is not merged".to_string(),
                    });
                } else {
                    if let Some(ref s) = spinner {
                        s.finish_with_message(format!(
                            "{}: PR #{} was already merged",
                            pr.repo_name, pr.pr_number
                        ));
                    }
                    success_count += 1;
                    json_merged.push(JsonMergedPr {
                        repo: pr.repo_name.clone(),
                        pr_number: pr.pr_number,
                    });
                }
            }
            Err(PlatformError::BranchBehind(_)) => {
                if let Some(ref s) = spinner {
                    s.finish_with_message(format!(
                        "{}: PR #{} branch is behind base branch",
                        pr.repo_name, pr.pr_number
                    ));
                }
                if !opts.json {
                    Output::info(
                        "  Hint: use 'gr pr merge --update' to update the branch and retry",
                    );
                }
                error_count += 1;
                json_failed_prs.push(JsonFailedPr {
                    repo: pr.repo_name.clone(),
                    pr_number: pr.pr_number,
                    reason: "branch is behind base branch".to_string(),
                });
            }
            Err(PlatformError::BranchProtected(ref msg)) => {
                if let Some(ref s) = spinner {
                    s.finish_with_message(format!("{}: {}", pr.repo_name, msg));
                }
                if !opts.json {
                    Output::info(
                        "  Hint: use 'gr pr merge --auto' to enable auto-merge when checks pass",
                    );
                    Output::info(&format!(
                        "  Or:   gh pr merge {} --admin --repo {}/{}",
                        pr.pr_number, pr.owner, pr.repo
                    ));
                }
                error_count += 1;
                json_failed_prs.push(JsonFailedPr {
                    repo: pr.repo_name.clone(),
                    pr_number: pr.pr_number,
                    reason: msg.clone(),
                });
            }
            Err(e) => {
                if let Some(ref s) = spinner {
                    s.finish_with_message(format!("{}: failed - {}", pr.repo_name, e));
                }
                json_failed_prs.push(JsonFailedPr {
                    repo: pr.repo_name.clone(),
                    pr_number: pr.pr_number,
                    reason: e.to_string(),
                });
                error_count += 1;

                if !opts.force
                    && manifest.settings.merge_strategy
                        == crate::core::manifest::MergeStrategy::AllOrNothing
                {
                    if !opts.json {
                        Output::error(
                            "Stopping due to all-or-nothing merge strategy. Use --force to bypass.",
                        );
                    }
                    return Err(e.into());
                }
                if opts.force
                    && manifest.settings.merge_strategy
                        == crate::core::manifest::MergeStrategy::AllOrNothing
                    && !opts.json
                {
                    Output::warning(&format!(
                        "{}: merge failed but continuing due to --force flag",
                        pr.repo_name
                    ));
                }
            }
        }
    }

    // Summary
    if opts.json {
        #[derive(serde::Serialize)]
        struct JsonPrMergeResult {
            success: bool,
            merged: Vec<JsonMergedPr>,
            failed: Vec<JsonFailedPr>,
            skipped: Vec<String>,
        }

        let result = JsonPrMergeResult {
            success: error_count == 0,
            merged: json_merged,
            failed: json_failed_prs,
            skipped: json_skipped,
        };
        println!("{}", serde_json::to_string_pretty(&result)?);
    } else {
        println!();
        if error_count == 0 {
            Output::success(&format!("Successfully merged {} PR(s).", success_count));
        } else {
            Output::warning(&format!(
                "{} merged, {} failed:",
                success_count, error_count
            ));
            for failed in &json_failed_prs {
                println!(
                    "  {}: PR #{} - {}",
                    failed.repo, failed.pr_number, failed.reason
                );
            }
        }
    }

    Ok(())
}

/// Check if a repo has changes ahead of its default branch
/// Returns Ok(true) if there are changes, Ok(false) if no changes or on default branch
fn check_repo_for_changes(repo: &RepoInfo) -> anyhow::Result<bool> {
    let git_repo = open_repo(&repo.absolute_path)
        .map_err(|e| anyhow::anyhow!("Failed to open repo: {}", e))?;

    let current = get_current_branch(&git_repo)
        .map_err(|e| anyhow::anyhow!("Failed to get current branch: {}", e))?;

    // Skip if on target branch
    if current == repo.target_branch() {
        return Ok(false);
    }

    // Check for commits ahead of target branch using shared helper
    has_commits_ahead(&git_repo, &current, repo.target_branch())
}