-f

electron · Apr 3, 2020 · 199e302 · 199e302
1 parent 0551d78
commit 199e302
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -218,7 +218,7 @@ step-gclient-sync: &step-gclient-sync
           "$CIRCLE_REPOSITORY_URL"
 
         if ! gclient sync --with_branch_heads --with_tags; then
-          if ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags; then
+          if ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync -f --with_branch_heads --with_tags; then
             # Re-export all the new patches now that they've been nicely 3-way
             # merged
             python src/electron/script/export_all_patches.py src/electron/patches/config.json