さてさて。
134de736dc (upstream/main) Change icons in web UI (#27385)
b1885387b6 Fix missing libyaml-dev dependency in Dockerfile (#27533)
15182d1e5e Fix history handling not properly handling states after update to react-router v5 (#27526)
6cf9f1211b Create custom Github Actions for common steps (#27518)
714e3ae5b5 Use Rails 7.1 `normalizes` feature (#27521)
50b7ea810e New Crowdin Translations (automated) (#27523)
e923bb9ec9 Use `ENV.fetch` in views, fixes rubocop haml-lint issue (#27527)
4fdc548fa5 Regenerate lint todos (#27513)
9482810703 Rewrite `emoji_unicode_mapping_light` to TS (#25444)
またまたreact-routerを更新してないとコンフリクトしそうな子が居るんじゃがひとつずつcherry-pickするしかないのかな…それじゃずっとcherry-pickし続けることになるな…うーん (思考停止)
$ git switch use-ruby33
$ git cherry-pick 9482810703
$ git cherry-pick 4fdc548fa5
$ git cherry-pick e923bb9ec9
$ git cherry-pick 50b7ea810e
$ git cherry-pick 714e3ae5b5
$ git cherry-pick 6cf9f1211b
$ git cherry-pick 15182d1e5e
Auto-merging app/javascript/mastodon/components/router.tsx
CONFLICT (content): Merge conflict in app/javascript/mastodon/components/router.tsx
error: could not apply 15182d1e5e... Fix history handling not properly handling states after update to react-router v5 (#27526)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
Recorded preimage for 'app/javascript/mastodon/components/router.tsx'
ﾊｲ
取り込んだフリしてrevertするのがいいかな
$ git checkout --theirs app/javascript/mastodon/components/router.tsx
$ git add app/javascript/mastodon/components/router.tsx
$ git cherry-pick --continue
$ git revert 15182d1e5e
$ git cherry-pick b1885387b6
$ git cherry-pick 134de736dc
CONFLICT (content): Merge conflict in app/javascript/mastodon/components/column_back_button.jsx
CONFLICT (content): Merge conflict in app/javascript/mastodon/components/column_header.jsx
CONFLICT (content): Merge conflict in app/javascript/mastodon/features/status/components/detailed_status.jsx
ｷｴｪ
134de736dcはコンフリクトしなかったファイルでもJavaScript側でいろいろとエラーを起こすみたいだ。ええと、b1885387b6をcherry-pickしたあとに戻って、
$ git reset --hard HEAD^
HEAD is now at 6caf77b637 Fix missing libyaml-dev dependency in Dockerfile (#27533)
今は取り込まないコミットをcherry-pickして
$ git cherry-pick 134de736dc
$ for f in app/javascript/mastodon/components/column_back_button.jsx app/javascript/mastodon/components/column_header.jsx app/javascript/mastodon/features/status/components/detailed_status.jsx; do git checkout --theirs $f; git add $f; done
$ git cherry-pick --continue
revert
$ git revert 134de736dc
Failed to compile.
./app/javascript/mastodon/components/column_header.jsx
Module not found: Error: Can't resolve 'mastodon/utils/react_router' in '/home/zunda/c/src/github.com/zunda/mastodon/app/javascript/mastodon/components'
くっそーw
git revert 134de736dcが期待どおりに全てを元に戻してくれてるわけじゃないんだな
$ git reset --hard HEAD^
$ git revert HEAD
たぶん動くからデプロイしようぜ 
\Master?/ \ますたー/
Merged mastodon/mastodon at e93a75f1a11d6dfdcbd39dbdc22526c5508ad881 with PRs #25047 #27489 #27507 #27526 #27385 reverted.
どんどーん取り込めないプルリクエストが増えてくる。react-router 5.xだいきらーい。