diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2025-10-30 23:16:14 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2025-11-05 15:01:16 +0900 |
| commit | 85e0f8c8783f5366c9c848efbf37f72beb17f574 (patch) | |
| tree | 02070c7488132026b6437413bcbb7abeb7657c3b /.github | |
| parent | b722631b481314023b9fa2f3fd16fa9ab0b4bf9c (diff) | |
sync_default_gems.rb: update paths and then do cherry-pick
Currently, we try to git cherry-pick the upstream commit and then
resolve merge conflicts in the working tree with the help of Git's
rename detection. By the nature of heuristics, it does not work reliably
when the upstream adds or removes files.
Instead, first prepare temporary commit objects with uninteresting files
removed and file paths adjusted for ruby/ruby, and then cherry-pick it.
The cherry-pick should succeed as long as the mapping rules are correct,
the upstream does not contain a funny merge that strictly depends on
merge order, and there are no local changes in ruby/ruby.
Diffstat (limited to '.github')
0 files changed, 0 insertions, 0 deletions
