Login

Recent searches

No recent searches

Search options

Not available on mastodon.zunda.ninja.
mastodon.zunda.ninja is one of the many independent Mastodon servers you can use to participate in the fediverse.
Zundon is a single user instance as home of @zundan as well as a test bed for changes of the code.

Administered by:

Server stats:

1
active users

mastodon.zunda.ninja: AboutPrivacy policy

Mastodon: AboutGet the appKeyboard shortcutsView source codev4.4.0-beta.1+469fd384-ruby-3.4.4

zunda

$ git merge --no-edit master
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging Gemfile
Automatic merge failed; fix conflicts and then commit the result.

ア、ハイ

zunda

<<<<<<< HEAD
rubocop-rails (2.4.0)
=======
rubocop-rails (2.4.2)
>>>>>>> master

そこ失敗するかなーw

··Web
2boosts·0favorites
のえる

@zundan ときどき、いやそれAuto Mergeでええやん……ってのあるよね

zunda

@noellabo ちょっと直感的じゃないことありますよねーw

ExploreLive feeds
About