Index: tools/push-to-trunk/git_recipes.py |
diff --git a/tools/push-to-trunk/git_recipes.py b/tools/push-to-trunk/git_recipes.py |
index 6b54510f6365b0d3de1ffd3386570036cc382a3f..4358258d3fc730ed0bc5edaa135fe9006fb8eade 100644 |
--- a/tools/push-to-trunk/git_recipes.py |
+++ b/tools/push-to-trunk/git_recipes.py |
@@ -65,7 +65,7 @@ class GitRecipesMixin(object): |
def GitCheckoutFile(self, name): |
assert name |
- self.Git(MakeArgs(["checkout --", name])) |
+ self.Git(MakeArgs(["checkout -f --", name])) |
@Strip |
def GitCurrentBranch(self): |