this post was submitted on 30 Oct 2023
13 points (93.3% liked)

Fediverse

28352 readers
446 users here now

A community to talk about the Fediverse and all it's related services using ActivityPub (Mastodon, Lemmy, KBin, etc).

If you wanted to get help with moderating your own community then head over to !moderators@lemmy.world!

Rules

Learn more at these websites: Join The Fediverse Wiki, Fediverse.info, Wikipedia Page, The Federation Info (Stats), FediDB (Stats), Sub Rehab (Reddit Migration), Search Lemmy

founded 1 year ago
MODERATORS
ruud@lemmy.world
Xylinna@lemmy.world
MrCenny@lemmy.world
TragicNotCute@lemmy.world
automodbeta@lemmy.world
woelkchen@lemmy.world
13
Fediverse software fork management (kbin.cafe)
submitted 1 year ago* (last edited 1 year ago) by feathers@kbin.cafe to c/fediverse@lemmy.world
9 comments fedilink hide all child comments
 

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
[–] feathers@kbin.cafe 1 points 1 year ago

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