This commit is contained in:
Scott Chacon 2024-05-24 10:45:54 +02:00
parent 757a4690ca
commit c58719b77d

View File

@ -523,7 +523,7 @@ pub fn update_base_branch(
// rebase failed, just do the merge
if rebased_head_oid.is_err() {
return result_merge(branch)
return result_merge(branch);
}
if let Some(rebased_head_oid) = rebased_head_oid? {