git merge upstream/master
@ikuradon I pretty much switched to "git rebase master" for this kind of thig. Only doing "git merge" for things where I'm the maintainer.
The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!