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

  • thisisawayoflife@lemmy.world
    link
    fedilink
    English
    arrow-up
    1
    ·
    1 year ago

    I’ve considered this, but my branches don’t generally live longer than a week and there isn’t usually multiple engineers working on a codebase at once. Thankfully my team is smallish and the projects are either small maintenance items or greenfield. I’ll look into where we can leverage it though!