1y ago

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

9 comments

You would never just merge into upstream. You need to make sure your fork is up to date and there are no code conflicts, then you create a pull request from your branch into the branch you would want to merge into. That information will probably be in the specific projects contribution document.
- Oh, no, haha, I didn't mean merging my changes into upstream! I meant merging upstream changes into my fork :p
  edit: changed wording in my post so it's a bit more clear what I mean
  
  Oh gotcha! Yeah, git merge upstreamNane branchName is the right method. Just be aware that you might have a whole host of conflicts to resolve if there's been a significant amount of time in your branch.
  One thing I like doing is creating a feature branch, then branching off that for very specific feature work. Then I try to complete that feature quickly and merge that into my feature branch and keep that up to date every day with the updated branch it was forked from. That way, I'm never too far behind production changes and the merge conflicts are kept at a minimum.

my lemmy instance owner's also own a fork of calkey
(hajkey)
- oooh, ty! I'll check out how they do it (...whenever their repo comes back online :p)

9 comments