I just update my #Mastodon instance to 3.5.1. It haas been a while since I have not done any complicated upgrade. I guess 2 years of simple docker-compose up -d and occasional migration. For both mastodon, nextcloud and other stuff at work.
In the same grain, the first commit is "fix conflicts". I am not sure how one can start a branch with a conflic.
#git usage a in my team.
I always see this pattern:
The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!