refs: leverage Conflict::is_resolved()

lib/src/op_store.rs

@@ -200,7 +200,7 @@ impl RefTarget {
 
     // TODO: overloaded naming: is_conflict() vs as_conflict()
     pub fn is_conflict(&self) -> bool {
-        self.conflict.as_resolved().is_none() // TODO: !is_resolved()
+        !self.conflict.is_resolved()
     }
 
     pub fn removed_ids(&self) -> impl Iterator<Item = &CommitId> {

lib/src/refs.rs

@@ -37,8 +37,7 @@ pub fn merge_ref_targets(
     .flatten()
     .simplify();
 
-    // TODO: switch to conflict.is_resolved()
-    if conflict.as_resolved().is_some() {
+    if conflict.is_resolved() {
         RefTarget::from_conflict(conflict)
     } else {
         let conflict = merge_ref_targets_non_trivial(index, conflict);