qwjyh/xdbm
1
1
Fork 0
mirror of https://github.com/qwjyh/xdbm synced 2025-04-20 03:35:55 +09:00
Code Issues Projects Releases 1 Packages Wiki Activity

refactor: change merge analysis match order

Browse source
This commit is contained in:
qwjyh 2025-02-27 02:14:41 +09:00
parent af9f57b408
commit 2452a023ad
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cmd_sync.rs
View file

@ -211,14 +211,14 @@ fn pull(
merge_analysis 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() => { ma if ma.is_none() => {
error!("no merge is possible"); error!("no merge is possible");
return Err(anyhow!("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 => { _ma => {
error!( error!(
"this code must not reachable: merge_analysis {:?}", "this code must not reachable: merge_analysis {:?}",