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 :^)

you are viewing a single comment's thread
view the rest of the comments

[–] pewgar_seemsimandroid@lemmy.blahaj.zone 3 points 10 months ago (1 children)

my lemmy instance owner's also own a fork of calkey

(hajkey)

[–] feathers@kbin.cafe 1 points 10 months ago

oooh, ty! I'll check out how they do it (...whenever their repo comes back online :p)