mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-01 12:26:02 +03:00
oops.
This commit is contained in:
parent
757a4690ca
commit
c58719b77d
@ -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? {
|
||||
|
Loading…
Reference in New Issue
Block a user