Unverified Commit 1feb8231 authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Specify origin in rebase operation (#1117)

parent c273bb02

tools/smithy-rs-sync/src/main.rs

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ fn resolve_git_repo(repo: &str, path: &Path) -> Result<PathBuf> { 
/// before syncing a commit into the target branch.

fn rebase_on_main(aws_sdk_path: &Path, branch: &str) -> Result<()> {

    let _ = run(&["git", "fetch", "origin", "main"], aws_sdk_path).context(here!())?;

    if let Err(err) = run(&["git", "rebase", "main"], aws_sdk_path) {

    if let Err(err) = run(&["git", "rebase", "origin/main"], aws_sdk_path) {

        bail!(

            "Failed to rebase `{0}` on top of `main`. This means there are conflicts \

            between `{0}` and `main` that need to be manually resolved. This should only \