From 2452a023ade02b4d312010a422e940d4ce3f3994 Mon Sep 17 00:00:00 2001 From: qwjyh Date: Thu, 27 Feb 2025 02:14:41 +0900 Subject: [PATCH] refactor: change merge analysis match order --- src/cmd_sync.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cmd_sync.rs b/src/cmd_sync.rs index 377d116..4b92d72 100644 --- a/src/cmd_sync.rs +++ b/src/cmd_sync.rs @@ -211,14 +211,14 @@ fn pull( merge_analysis )); } - ma if ma.is_normal() => { - error!("unable to fast-forward. manual merge is required"); - return Err(anyhow!("unable to fast-forward. manual merge is required")); - } ma if ma.is_none() => { error!("no merge is possible"); return Err(anyhow!("no merge is possible")); } + ma if ma.is_normal() => { + error!("unable to fast-forward. manual merge is required"); + return Err(anyhow!("unable to fast-forward. manual merge is required")); + } _ma => { error!( "this code must not reachable: merge_analysis {:?}",