diff --git a/osc/core.py b/osc/core.py
index 68d79b6b..2eed11b4 100755
--- a/osc/core.py
+++ b/osc/core.py
@@ -763,7 +763,7 @@ class Package:
               elif st == 'C':
                   have_conflicts = True
 
-        if have_conflicts or self.islinkrepair():
+        if have_conflicts:
             print 'Please resolve all conflicts before committing using "osc resolved FILE"!'
             return 1