Optimise the merge operation

[stgit] / stgit / commands / common.py

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index c4ddc945e46bbef26d40509232abf98106df0e0a..86f62fb032f41e1ef5527536a29a41f786a05e2b 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -100,7 +100,7 @@ def print_crt_patch():
         print 'No patches applied'
 
 def resolved(filename):
-    git.update_cache([filename])
+    git.update_cache([filename], force = True)
     for ext in ['.local', '.older', '.remote']:
         fn = filename + ext
         if os.path.isfile(fn):