fix(#2393): ff-merge config prs via forge api instead of pushing main

2026-07-13 11:18:43 +02:00 · 2026-07-13 11:18:43 +02:00 · 6e0f6893cf
commit 6e0f6893cf
parent ef14641b94
4 changed files with 135 additions and 197 deletions
--- a/hive-c0re/src/forge/mod.rs
+++ b/hive-c0re/src/forge/mod.rs
@ -10,8 +10,8 @@ mod repos;
 mod users;

 pub use pr_merge::{
-    ForgeMergeError, config_repo, fetch_pr_head_into_applied, ff_push_to_main, mark_pr_merged,
-    pr_head_sha, pr_is_open,
+    ForgeMergeError, config_repo, fetch_pr_head_into_applied, merge_config_pr_ff, pr_head_sha,
+    pr_is_open,
 };
 pub use repos::{
    create_agent_repo, ensure_config_repo, ensure_knowledge_repo, ensure_meta_remote, ensure_repo,