conflict resolution for pullMatches

src/list.go

@@ -45,15 +45,17 @@ type traversalSt struct {
 	inTrash  bool
 }
 
-func (g *Commands) ListMatches() (error) {
+func (g *Commands) ListMatches() error {
 	matches, err := g.rem.FindMatches(g.opts.Path, g.opts.Sources, g.opts.InTrash)
-    if err != nil {
-        return err
-    }
+	if err != nil {
+		return err
+	}
 
 	spin := g.playabler()
 	spin.play()
 
+	traversalCount := 0
+
 	for match := range matches {
 		if match == nil {
 			continue
@@ -67,13 +69,19 @@ func (g *Commands) ListMatches() (error) {
 			mask:     g.opts.TypeMask,
 		}
 
+		traversalCount += 1
+
 		if !g.breadthFirst(travSt, spin) {
 			break
 		}
 	}
 
 	spin.stop()
 
+	if traversalCount < 1 {
+		g.log.LogErrln("no matches found!")
+	}
+
 	return nil
 }
 

src/pull.go

@@ -104,12 +104,20 @@ func (g *Commands) PullMatches() (err error) {
 	}
 
 	if len(cl) < 1 {
-		return fmt.Errorf("no matches found!")
+		return fmt.Errorf("no changes detected!")
 	}
 
-	ok := printChangeList(g.log, cl, !g.opts.canPrompt(), g.opts.NoClobber)
+	nonConflictsPtr, conflictsPtr := g.resolveConflicts(cl, false)
+	if conflictsPtr != nil {
+		warnConflictsPersist(g.log, *conflictsPtr)
+		return fmt.Errorf("conflicts have prevented a pull operation")
+	}
+
+	nonConflicts := *nonConflictsPtr
+
+	ok := printChangeList(g.log, nonConflicts, !g.opts.canPrompt(), g.opts.NoClobber)
 	if ok {
-		return g.playPullChangeList(cl, g.opts.Exports)
+		return g.playPullChangeList(nonConflicts, g.opts.Exports)
 	}
 	return nil
 }