$ git merge --no-edit masterAuto-merging Gemfile.lockCONFLICT (content): Merge conflict in Gemfile.lock
ア、ハイ (トイレ行きたい)
Mastodon is the best way to keep up with what's happening.
Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.