$ git merge --no-edit masterAuto-merging config/locales/en.ymlAuto-merging Gemfile.lockCONFLICT (content): Merge conflict in Gemfile.lockAuto-merging GemfileAutomatic merge failed; fix conflicts and then commit the result.
ありゃw
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.