なるほど、confilict解消したら改めてgit addしないといけないのか
The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!
