Fediverse software fork management
Hey, if there are any folks here involved in friendly forks of fediverse software - Do you use any fancy merge strategies to merge upstream changes into your fork? What's your mileage?
I've been hacking away at a private lil fork of Pleroma, adding some little convenience features for myself, and thought it might be a good idea to ask if I should be doing any of the fancy stuff github describes in their article about friendly fork management, or if I'll be alright just doing git merge upstream/develop
:^)
![](https://kbin.life/media/cache/resolve/entry_thumb/5e/ac/5eaccf409567f7c075497d227048b6e6e78ce1871c718b0892b1b5d2f3655af4.png)