16
Fediverse software fork management
(kbin.cafe)
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!
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
You need rebase instead. Merge just creates useless commits and makes the diffs harder to comprehend (all changes are shown at once, but with rebase you fix the conflicts in the commit where they happened)
Then instead of your branch of branch strat you just rebase daily into main and you're golden when it comes time to PR
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!
This 100%
Yep yep, that's what I do for my feature branches! ;)
Or, well, at least when I'm the only one working on them, anyway~
Oh haha, I really doubt I need to worry about that; these are pretty community-specific features, I doubt the upstream project would even want them. I am concerned only with keeping my fork's main development branch up to date with the upstream's. Y'know, after I merge my custom features into it. There seem to be a bunch of intricate ways to do it (see the blogpost I linked), and I'm unsure if I should care about any of those, or if I can get away with just,, doing a normal merge.