From 00f263e6c4cc709e5bdcce2c903c12f5d76f8a37 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@gmail.com>
Date: Fri, 1 Sep 2023 16:02:23 -0700
Subject: [PATCH] sync_default_gems.rb: Deal with conflicts on ignored files

that do not exist in the ruby/ruby side.

This resurrects a line that had existed prior to #8329.
---
 tool/sync_default_gems.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 2879ff6081..fcfb06047e 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -602,6 +602,7 @@ module SyncDefaultGems
 
     unless ignore.empty?
       puts "Reset ignored files: #{ignore.join(', ')}"
+      system(*%W"git rm -r --", *ignore)
       system(*%W"git checkout -f", base, "--", *ignore)
     end