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

  • feathers@kbin.cafeOP
    link
    fedilink
    arrow-up
    1
    ·
    1 year ago

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