diff --git a/crates/gitbutler-branch-actions/src/upstream_integration.rs b/crates/gitbutler-branch-actions/src/upstream_integration.rs index 2e2fdb84629..9cadd2afec1 100644 --- a/crates/gitbutler-branch-actions/src/upstream_integration.rs +++ b/crates/gitbutler-branch-actions/src/upstream_integration.rs @@ -568,7 +568,9 @@ pub(crate) fn integrate_upstream( let statuses = upstream_integration_statuses(&context)?; let StackStatuses::UpdatesRequired { statuses, .. } = statuses else { - bail!("Branches are all up to date") + return Ok(IntegrationOutcome { + deleted_branches: vec![], + }); }; if resolutions.len() != context.stacks_in_workspace.len() {