Skip to content

Commit d2d3ea8

Browse files
committed
fix: Add split_repo_feature from split repo
Rail-Origin: remote@a8524e48d1b30139614f975227428841a62a8522
1 parent 2426a1b commit d2d3ea8

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

crates/cargo-rail/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ enum Commands {
6262
#[arg(long)]
6363
to_remote: bool,
6464
/// Conflict resolution strategy: ours (use monorepo), theirs (use remote), manual (create markers), union (combine both)
65-
#[arg(long, default_value = "manual")]
65+
#[arg(long, visible_alias = "conflict", default_value = "manual")]
6666
strategy: String,
6767
/// Actually perform the sync (default: dry-run mode showing plan)
6868
#[arg(long)]

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ pub fn phase3_feature() -> &'static str {
2929
"This is a new feature from Phase 3 testing"
3030
}
3131

32+
// Phase 3 Test 3.3: New feature added in split repo
33+
pub fn split_repo_feature() -> &'static str {
34+
"This change originates from the split repo"
35+
}
36+
3237
#[cfg(test)]
3338
mod tests {
3439
use super::*;

0 commit comments

Comments
 (0)