diff options
| -rwxr-xr-x | tool/sync_default_gems.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 5aa7eb06eb..8d33004ffb 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -520,7 +520,7 @@ def sync_default_gems_with_commits(gem, ranges, edit: nil) skipped = true elsif /^CONFLICT/ =~ result result = pipe_readlines(%W"git status --porcelain -z") - result.map! {|line| line[/\A.U (.*)/, 1]} + result.map! {|line| line[/\A(?:.U|AA) (.*)/, 1]} result.compact! ignore, conflict = result.partition {|name| IGNORE_FILE_PATTERN =~ name} unless ignore.empty? |