Fix the scope of rubygems conflict resolution
The git reset and rm_rf are not necessary because bundler/ is considered as a toplevels and removed from the commit when there's no conflict.
git reset
rm_rf
bundler/
toplevels
For conflict cases, it's useful to remove them from the conflict targets before moving on to fix other paths.
Added by k0kubun (Takashi Kokubun) almost 2 years ago
Fix the scope of rubygems conflict resolution
The
git resetandrm_rfare not necessary becausebundler/isconsidered as a
toplevelsand removed from the commit when there'sno conflict.
For conflict cases, it's useful to remove them from the conflict targets
before moving on to fix other paths.