diff --git a/src/components/pull.rs b/src/components/pull.rs index 8c920430..08764d05 100644 --- a/src/components/pull.rs +++ b/src/components/pull.rs @@ -158,11 +158,11 @@ impl PullComponent { if let Err(err) = merge_res { log::trace!("ff merge failed: {}", err); self.confirm_merge(branch_compare.behind); - } else { - self.hide(); } } + self.hide(); + Ok(()) }