Merge pull request #2 from loadingalias/rail/sync/test-crate-a/1763010755

Rail/sync/test crate a/1763010755

Author: loadingalias

crates/cargo-rail/src/main.rs

@@ -62,7 +62,7 @@ enum Commands {
     #[arg(long)]
     to_remote: bool,
     /// Conflict resolution strategy: ours (use monorepo), theirs (use remote), manual (create markers), union (combine both)
-    #[arg(long, default_value = "manual")]
+    #[arg(long, visible_alias = "conflict", default_value = "manual")]
     strategy: String,
     /// Actually perform the sync (default: dry-run mode showing plan)
     #[arg(long)]

crates/test-crate-a/src/lib.rs

@@ -29,6 +29,11 @@ pub fn phase3_feature() -> &'static str {
   "This is a new feature from Phase 3 testing"
 }
 
+// Phase 3 Test 3.3: New feature added in split repo
+pub fn split_repo_feature() -> &'static str {
+  "This change originates from the split repo"
+}
+
 #[cfg(test)]
 mod tests {
   use super::*;