やるきでんこちゃん 
d9eee9bf9a (upstream/main) Remove column defaults for `status_pins` timestamp columns (#29261)
b128474625 Fixed rendering of excess whitespace in status card titles (#30017)
f4a53f3fb4 Extract constants for column size length validation limits (#30045)
ebcf9840f4 New Crowdin Translations (automated) (#30050)
74012831f6 Change mute options to be in dropdown on muted users list in web UI (#30049)
b903e6909e Disable `Style/HashAsLastArrayItem` cop (#30041)
0e585b9a52 Update to Ruby 3.2.4 (#30036)
$ git merge --no-edit master
Auto-merging .ruby-version
CONFLICT (content): Merge conflict in .ruby-version
それはそう
$ git checkout --ours .ruby-version
$ git add !$
$ git commit
\Master?/ \ますたー/
Merged mastodon/mastodon at d9eee9bf9a3a3e99acb1cea12082faf0fe8de0f9.
@zundan ダジャレを検出しました（検出ワード: CONFLICT）