[+] Conflict resolution (#4)

* [+] Conflict resolution * [F] Fix conflict resolution branches being synched
2026-05-08 01:16:13 -04:00
parent 67dd55a1cf
commit ebeb045c51
13 changed files with 1370 additions and 37 deletions
@@ -1,6 +1,7 @@
 use super::*;
 use crate::config::{
-    EndpointConfig, MirrorConfig, NamespaceKind, SiteConfig, TokenConfig, Visibility,
+    ConflictResolutionStrategy, EndpointConfig, MirrorConfig, NamespaceKind, SiteConfig,
+    TokenConfig, Visibility,
 };
 use std::io::{Read, Write};
 use std::net::TcpListener;
@@ -111,6 +112,7 @@ fn matches_jobs_by_provider_and_namespace() {
            create_missing: true,
            visibility: Visibility::Private,
            allow_force: false,
+            conflict_resolution: ConflictResolutionStrategy::Fail,
        }],
        webhook: None,
    };