CONFLICT (content): Merge conflict in yarn.lock
ほえ。package.json変えてないハズだし
$ git checkout --theirs yarn.lockUpdated 1 path from the index
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.