$ git checkout mastererror: Your local changes to the following files would be overwritten by checkout:
Conflictを解消してからcommitしてなかったよね
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.